Merge
Merge branch 'master' of https://github.com/hoerresb/capstone.git
Changed trainers to be associated with users rather than plans.
Several changes to AddEditUsers.