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
Merge branch 'master' into nilsbranch
Merge branch 'master' into nilsbranch
Query: program-add!
User-functions and program manager
Merge branch 'nilsbranch' of github.com:se1-1314/xiast into nilsbranch

Conflicts:
	src/xiast/database.clj
	src/xiast/query.clj