Added manager field to the user's page
Merge branch 'master' of github.com:cbednarski/demarco