add search box
relocate my page
relocate my page
Add userID in subject
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
Add interceptor for lang, add localization for login.jsp
add admin page and sql dump
Add localization, update spring security, update registration controller
Change sql dump and add pages to admin menu
Merge branch 'master' into ivan

Conflicts:
	SSEL/src/main/webapp/WEB-INF/jdbc.properties
Categories and start date in index
Remake method reset password, add icon for lang
Merge branch 'master' into roma
commit
Merge branch 'master' of https://github.com/nromanen/Ch-025 into hash

Conflicts:
	SSEL/app_log.log
	SSEL/src/main/java/com/softserve/entity/Subject.java
	SSEL/src/main/java/com/softserve/entity/User.java
	SSEL/src/main/webapp/WEB-INF/spring/security.xml
	SSEL/src/main/webapp/WEB-INF/tiles/pages.xml
add button for lang.