Merge branch 'master' into profiles

Conflicts:
	resources/public/js/calendarviewer.js
	resources/templates/layout.html
Merge branch 'master' of https://github.com/se1-1314/xiast