Merge pull request #230 from stianst/master

KEYCLOAK-284 Subject in token is now user id instead of username