bla vergeten
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	spring-ws/Registration/src/main/java/nl/ase/dare2date/webservice/application/ApplyRegistrationEndpoint.java
merged with rens