Calendar views
Merge branch 'master' of https://github.com/mzdravkov/ao-callendar

Conflicts:
	app/views/home/index.html.erb