details-page "back to Calendar" button do usefull
Merge remote-tracking branch 'upstream/dev' into dev

Conflicts:
	scripts/controllers/details-controller.js
	views/details-page.html