Merge origin/master

Conflicts:
	src/main/java/com/mycompany/apps/ejbs/UserRegistManager.java
	src/main/java/com/mycompany/apps/filter/XHTMLSecurityFilter.java
	src/main/webapp/index.xhtml
	src/main/webapp/view/login/error.xhtml
	src/main/webapp/view/login/index.xhtml