Display orders on upgrade #1078
Cleanup: Deface warning about overrides #171
Merge pull request #4 from casualsteps/deface_warning_cleanup_171

Cleanup: Deface warning about overrides #171
Merge pull request #3 from casualsteps/user_upgrade_1078

User upgrade #1078
Merge branch 'master' into signup_checkbox_430

Conflicts:
	app/views/spree/orders/_reg_after_order.html.erb