Merge branch 'master' into stable

Conflicts:
	advanced_search.php

NOTE! this commit performs a small rebase on stable branch
New minified JS