calendar_all.html
Merge remote-tracking branch 'origin/master'

Conflicts:
	config/routes.yaml
	static/javascripts/chain.js
	views/required.html
	views/sidemenu.html
sidemenu