some minor changes
Merged
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'heroku/master'

Conflicts:
	app/models/feedback.rb
Revert "Merge remote-tracking branch 'heroku/master'"

This reverts commit e097aaaa59d9c3864c7ed97f456e888f23d48230, reversing
changes made to fdd295f6d68d3c3930b42f090f939597c2f0ba42.