Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/events.jsp
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/events.jsp
refactored
refactored
refactored
refactored
refactored
refactored
after idead refactor
after idead refactor
after idead refactor