ui changes.
merged
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/resources/bootstrap/css/entertainment.css
	src/main/webapp/resources/bootstrap/img/pageBanner.jpg
	src/main/webapp/resources/html/event/eventpage.html
	src/main/webapp/resources/html/event/findevent.html