fix some bugs
Merge branch 'master' of https://github.com/nromanen/Ch-025

Conflicts:
	SSEL/.gitignore
relocate my page
Add userID in subject
Add interceptor for lang, add localization for login.jsp
add admin page and sql dump
works - do not touch
works - do not touch
Delete .gitignore.orig
Delete .gitignore.bak
Delete app_log-10-24-2014.log
Delete app_log-10-26-2014.log
Delete app_log.log
Update .gitignore
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