Merge branch 'login' into wildfly

Conflicts:
	pom.xml