add calendar_dates controller
Merge branch 'master' into calendar_date-controller

Conflicts:
	app/api/__init__.py
Merge branch 'calendar_date-controller'