moved calendar to angular
Merge branch 'master' of https://www.github.com/theloons/sportim-web

Conflicts:
	app/js/calendar.js
	app/views/calendar.html