logout
Merge remote-tracking branch 'upstream/master'
Upgrade to tomcat.7.0.54
Fix equals huge error, too much Javascript lately
Merge branch 'master' of https://github.com/ungarida/keycloak into ungarida-master

Conflicts:
	integration/tomcat7/adapter/src/main/java/org/keycloak/adapters/tomcat7/AuthenticatedActionsValve.java
Merge branch 'ungarida-master'