AndroidController
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/artifacts/groepI_war_exploded.xml
	.idea/workspace.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	groepI.iml
Hibernate & test aanpassingen Answer & AnswerInstance
(AnswerInstanceTest dient nog aangepast te worden)
Merge remote-tracking branch 'origin/master'