travis db
Merge branch 'develop' into feature/calendar

Conflicts:
	.sass-cache/6353d42846c860f449e04745512fcce37e92198e/calendar.css.scssc
	.travis.yml
	Gemfile
	config/initializers/carrierwave.rb
merge