check in some changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/planit/persistence/registration/UserRepository.java
	src/main/webapp/WEB-INF/mvc-dispatcher-servlet.xml
Merge remote-tracking branch 'origin/master'
add in the event type