checkin conflicts codes
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/planit/mvc/events/EventController.java
checkin conflicts codes