Added fields to user model. Removed test annotation from appointmentTypeController because it was failing build process.
Merge branch 'master' of https://github.com/joubin/CSC191