Merge remote-tracking branch 'origin/v2' into v2_fix_material

# Conflicts:
#	src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig

diff --cc src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
index 8a49190e81fb112baf6cd84d753db0189d3ae050,54bba9a6a68a0216856090dcf322fbe2a786de88..2b32c2f9d92796a72fc6edff7bf7ac67e2e371ec
--- 1/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
--- 2/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
@@@ -18,67 -18,6 +18,68 @@@
  {% block header %}
  {% endblock %}
  
-             <li class="bold {% if currentRoute == 'starred' %}active{% endif %}"><a class="waves-effect" href="{{ path('starred') }}">{% trans %}favorites{% endtrans %}</a></li>
 +{% block messages %}
 +    {% for flashMessage in app.session.flashbag.get('notice') %}
 +        <script>
 +            Materialize.toast('{{ flashMessage }}', 4000);
 +        </script>
 +    {% endfor %}
 +{% endblock %}
 +
 +{% block menu %}
 +    <nav class="cyan darken-1">
 +        <ul id="slide-out" class="side-nav fixed">
 +            {% block logo %}
 +                <li class="logo border-bottom">
 +                    <a class="waves-effect" title="{% trans %}Back to unread articles{% endtrans %}" href="{{ path('unread') }}">
 +                        <img src="{{ asset('themes/baggy/img/logo-other_themes.png') }}" alt="wallabag logo" />
 +                    </a>
 +                </li>
 +            {% endblock %}
 +
 +            {% set currentRoute = app.request.attributes.get('_route') %}
 +
 +            <li class="bold {% if currentRoute == 'unread' or currentRoute == 'homepage' %}active{% endif %}"><a class="waves-effect" href="{{ path('unread') }}">{% trans %}unread{% endtrans %}</a></li>
-             <li class="bold border-bottom {% if currentRoute == 'tags' %}active{% endif %}"><a class="waves-effect" href="?view=tags">{% trans %}tags{% endtrans %}</a></li>
++            <li class="bold {% if currentRoute == 'starred' %}active{% endif %}"><a class="waves-effect" href="{{ path('starred') }}">{% trans %}starred{% endtrans %}</a></li>
 +            <li class="bold {% if currentRoute == 'archive' %}active{% endif %}"><a class="waves-effect" href="{{ path('archive') }}">{% trans %}archive{% endtrans %}</a></li>
++            <li class="bold border-bottom {% if currentRoute == 'tags' %}active{% endif %}"><a class="waves-effect" href="{{ path('tag') }}">{% trans %}tags{% endtrans %}</a></li>
 +            <li class="bold {% if currentRoute == 'config' %}active{% endif %}"><a class="waves-effect" href="{{ path('config') }}">{% trans %}config{% endtrans %}</a></li>
++            <li class="bold {% if currentRoute == 'howto' %}active{% endif %}"><a class="waves-effect" href="{{ path('howto') }}">{% trans %}howto{% endtrans %}</a></li>
 +            <li class="bold"><a class="waves-effect" class="icon icon-power" href="{{ path('logout') }}" title="{% trans %}logout{% endtrans %}">{% trans %}logout{% endtrans %}</a></li>
 +        </ul>
 +        <div class="nav-wrapper nav-panels">
 +            <a href="#" data-activates="slide-out" class="nav-panel-menu button-collapse"><i class="mdi-navigation-menu"></i></a>
 +            <div class="left action">
 +                {% if currentRoute == 'unread' or currentRoute == 'homepage' %}{% trans %}Unread{% endtrans %}{% endif %}
 +                {% if currentRoute == 'starred' %}{% trans %}Starred{% endtrans %}{% endif %}
 +                {% if currentRoute == 'archive' %}{% trans %}Archive{% endtrans %}{% endif %}
 +                {% if currentRoute == 'tags' %}{% trans %}Tags{% endtrans %}{% endif %}
 +                {% if currentRoute == 'config' %}{% trans %}Config{% endtrans %}{% endif %}
 +            </div>
 +            <div class="input-field nav-panel-buttom">
 +                <ul>
 +                    <li class="bold"><a class="waves-effect" href="{{ path('new_entry') }}" id="nav-btn-add"><i class="mdi-content-add"></i></a></li>
 +                    <li><a class="waves-effect" href="javascript: void(null);" id="nav-btn-search"><i class="mdi-action-search"></i></a>
 +                </ul>
 +            </div>
 +            <form method="get" action="index.php">
 +                <div class="input-field nav-panel-search" style="display: none">
 +                    <input name="search" id="searchfield" type="search" required placeholder="{% trans %}Enter your search here{% endtrans %}">
 +                    <label for="search"><i class="mdi-action-search"></i></label>
 +                    <i class="mdi-navigation-close"></i>
 +                </div>
 +            </form>
 +            <!--<form name="entry" method="post" action="{{ path('new_entry') }}">
 +                <div class="input-field nav-panel-add" style="display: none">
 +                    <input id="add entry_url" name="entry[url]" type="search" required placeholder="{% trans %}Enter your link here{% endtrans %}">
 +                    <label for="add"><i class="mdi-content-add"></i></label>
 +                    <i class="mdi-navigation-close"></i>
 +                </div>
 +            </form>-->
 +        </div>
 +    </nav>
 +{% endblock %}
 +
  {% block footer %}
      <footer class="page-footer cyan darken-2">
          <div class="container">