add search box
fix bug with search and menu
add remind and restore controller, jsp. UserService add new method
merge
Merge branch 'master' into roma
add password to db connect
Merge branch 'master' into ivan

Conflicts:
	SSEL/src/main/webapp/WEB-INF/jdbc.properties