Merge branch 'master' into oauth2

Conflicts:
    pom.xml
added user with role "ROLE_USER". added test page for oauth2
added CORS filter
added auto approve and non auto approve clients
added /logout
invalidate httpsession after successful oauth2 authorize request
removed LogoutController in favor of a customized LogoutFilter. added remember me