Changes to manageevents.xhtml
Merge branch 'master' of github.com:Coffei/PeakTogether

Conflicts:
	peaktogether-web/src/main/webapp/manageevents.xhtml