Merge origin/master

Conflicts:
	public/img/button_search.png
Merge origin/master

Conflicts:
	public/img/button_search.png