rails new rails-starter -d postgresql -T (4.0.2)
rails new rails-starter -d postgresql -T (4.0.4)
Merge tag 'rails-new-v4.0.4'

rails new rails-starter -d postgresql -T (4.0.4)

Conflicts:
	Gemfile
	Gemfile.lock
bundle update
Merge branch 'master' into bootstrap

Conflicts:
	Gemfile