Merge branch 'master' of https://github.com/thelia/thelia

Conflicts:
	core/lib/Thelia/Config/Resources/routing/admin.xml

templates/admin/default/admin-layout.tpl

@@ -163,6 +163,17 @@
 
                         {/loop}
                     </ul>
+                    
+                    {loop name="top-bar-search" type="auth" roles="ADMIN" permissions="admin.search"}
+                    <form class="navbar-form pull-right" action="{url path='/admin/search'}">
+                         <div class="form-group">
+                            <div class="form-group">
+                                <input type="text" class="form-control" id="search_term" name="search_term" placeholder="{intl l='Search'}">
+                            </div>
+                            <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-search"></span></button>                       
+                         </div>
+                    </form>
+                    {/loop}
 
     			</div>
             </div>

templates/admin/default/product-attributes-edit.html

@@ -0,0 +1 @@
+test