add i18n file
Update pom.xml
Merge branch 'SpringSecurity'
Merge branch 'SpringSecurity'

Conflicts:
	SpringSecurity/pom.xml