javascript calendar library
Merge branch 'master' of https://github.com/se1-1314/xiast into calendar
Rendering, view of a calendar instance
Calendar render
merged with master
Merge branch 'master' into calendar

Conflicts:
	resources/templates/schedule.html