Changes
Adding Calendar
Merge branch 'refs/heads/Features'

Conflicts:
	app/view/Main.js
	resources/sass/app.scss