updated manager/player checking logic
correcting login for users
manager/player logic
Merge branch 'master' into production