doctrine adapter for auth
Merge branches 'master' and 'doctrine'