merged
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/resources/html/event/EventDetails.html
	src/main/webapp/resources/html/event/tickethistory.html