fixes for fig / docker
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gemfile.lock
	app/controllers/pages_controller.rb
	db/seeds.rb