Edit user interface. Edit files search
Merge branch 'master' of https://github.com/SavrukSergiy/dreamhost

Conflicts:
	webapp/WEB-INF/jsp/user/browser.jsp