Did some corrections and review. Tried to fix the bug with manager access!
Renamed the Manager-->manager
Fix for bug!
Merge origin/master