fixes for fig / docker
Merge commit '90cc3f31301dd0f0a1f5eec0ac07e469eb9fbd0e' into HEAD

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