change auth to check manager table
Merge manager
Merge master into activity