refactored UserAuthenticationFilter
Merge branch 'mitja'