Lock bootstrap-sass to 2.3.2.2, 3.0 seems to have problems.
Merge branch '0.19'
Merge branch 'develop'
ubuntu dev env setup causes geomfile.lock change
Merge remote-tracking branch 'origin/master' into 274_trip_cards_update

Conflicts:
	Gemfile.lock