blabla

lawl
User

User model
PatientUser

PatientUser model
TherapistUser

TherapistUser model
Merge remote-tracking branch 'origin/Jeroen'
Merge branch 'master' of https://github.com/duytrann/HipperTeam4

Conflicts:
	HipperEnterprise/src/java/models/User.java