Pushing working DB.edmx
Merge branch 'master' of https://github.com/Yuugo/Health-Informatics-Social-Phobia

Conflicts:
	Code/NijnCoach/NijnCoach/Database/NijnCoachModel.Designer.cs
	Code/NijnCoach/NijnCoach/Database/NijnCoachModel.edmx
	Code/NijnCoach/NijnCoach/View/QuestionnaireForm/QuestionnaireForm.cs