fixed master
fixed carrierwave/fog
Merge branch 'master' into develop
Merge branch 'develop' into feature/calendar

Conflicts:
	.sass-cache/e8a8eb3d4cf8265cbaf5e25b8380f753c9f2d1ac/calendar.css.scssc
	Gemfile
	Gemfile.lock
deleted routes help file