Search Filters and Account disable bug fix
Merge branch 'master' into praveen

Conflicts:
	routes/admin.php
Search Filters and Events