Fix for #145
Merge branch 'staging' of github.com:Orasi/blue-source into staging

Conflicts:
	app/controllers/calendar_controller.rb