some styling, add own events to post
try to pass own events to timetable
Merge branch 'master' of https://github.com/riddlore/InterTime into riddlore-master

Conflicts:
	templates/timetable/plan.html