locale
Merge branch 'master' of https://github.com/akaver/JEE-BorderGuard2.git

Conflicts:
	WebContent/WEB-INF/beans.xml
	WebContent/WEB-INF/dispatcher.xml