wtf
merge
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
application refactor
Merge remote-tracking branch 'upstream/master'

Conflicts:
	bundled-war-example/src/main/java/org/keycloak/server/KeycloakServerApplication.java
	bundled-war-example/src/main/webapp/WEB-INF/web.xml
merge
Merge pull request #348 from patriot1burke/master

KeycloakApplication refactor