moved few fields from edit event to manage event.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/resources/html/event/editevent.html