Change Account Edit
Fix Manager Dashboard
Merge branch 'dashManager' into develop
Merge Develop with Dashboard Manager