no message
Merge branch 'master' of https://github.com/alecha/Bianconiglio

Conflicts:
	Bianconiglio/partials/SearchPage.html