ui changes.
Conflicts:
	src/main/webapp/resources/html/event/findevent.html