new_branch
Merge branch 'master' of https://github.com/alexisraca/Meyah

Conflicts:
	app/views/users/_search_form.html.haml