Fixed spring security context, new db schema, added test users
Merge remote-tracking branch 'origin/master'