logout
Merge remote-tracking branch 'upstream/master'
Upgrade to tomcat.7.0.54
Fix equals huge error, too much Javascript lately
Merge pull request #650 from mposolda/master

More Federation & LDAP fixes
Rename audit to events
Merge pull request #651 from stianst/master

Rename audit to events
Reduce log in UserFederationResource
Added password token to use inplace of plain-text password for totp
Merge pull request #652 from stianst/master

Password token
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'
Fix test
Merge pull request #653 from stianst/master

Fix test
KEYCLOAK-648 Fix removing role from composite role
Merge pull request #654 from stianst/master

KEYCLOAK-648 Fix removing role from composite role
Clean user credential management form
Merge pull request #655 from stianst/master

Clean user credential management form
Fixes to event-store-mem example
Merge pull request #656 from stianst/master

Fixes to event-store-mem example