Revert "controllers for calendar and popovers"

This reverts commit c9e39255253c4ee002a379cfffbcfef161f1017c.

Conflicts:

	app/views/layouts/conversations.html.haml