started adding admin over all users
Merge remote-tracking branch 'origin/master' into WebApollo