Cleaned up Branch Login.
- Final for merging with master.
- Please don't change spring-security.xml, spring-database.xml, web.xml, pom.xml without asking me (SZ) first!