First Relation Added =D
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	src/main/java/be/kdg/groepi/model/User.java