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

Conflicts:
	SSEL/.gitignore
Add interceptor for lang, add localization for login.jsp
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
Categories and start date in index
Remake method reset password, add icon for lang
Merge branch 'master' into roma
commit
add chenge order functions
Merge branch 'hash' of https://github.com/nromanen/Ch-025 into hash
add chenge order functions
add button for lang.