Fixes issue for nil in vacation.
Hot fix for Adam/Alissa's issue.
Merge branch 'staging'

Conflicts:
	app/controllers/calendar_controller.rb
Changes made for prod
Merge branch 'master' of github.com:Orasi/blue-source

Conflicts:
	config/initializers/secret_token.rb
Fixes to location and project.
Merge branch 'master' of github.com:Orasi/blue-source
Added title there too..
Merge branch 'master' of heroku.com:bluesourcestaging into staging