add calendars controller
Merge branch 'master' into calendar-controller

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