manage participants equipement
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	src/main/java/be/kdg/teamf/controller/UserController.java
	src/main/resources/messages_fr.properties
	src/main/resources/messages_nl.properties
benodigdheden