ui
ui
Merge branch 'master' of https://github.com/park0ur/UAWebContest

Conflicts:
	tpl/events.tpl
	tpl/notes.tpl