added changes for profile and manager
Merge branch 'master' of https://github.com/paulmoon/seng422