refactoring search, refactoring grid
Merge branch 'master' of github.com:neno/navigator-3-frontend

Conflicts:
	app/views/articles/_article.html.haml