give a place for user to override from-mail address
fix tyop to pass spec
Use rails 4 strong parameters to be compatible with refinery edge (3.0)
Conflicts:
	app/controllers/refinery/inquiries/admin/settings_controller.rb
	app/controllers/refinery/inquiries/inquiries_controller.rb
Set version 3.0.0.dev and also update refinery dependencies to 3.0.0.dev.
load_tasks isn't working anymore.
Get rid of redundant gems in the Gemfile. Also added back capybara-email.
Rewrite settings update logic taking into account strong parameters.
Merge branch 'master' into refactor_2014

Conflicts:
	Gemfile
	app/models/refinery/inquiries/inquiry.rb
Merge pull request #120 from wongyouth/master

It'd be better to give a place for user to override `from mail` info
Wrap from_name in quotes as per #136.

Also make from_* methods private because we don’t want these to be
“deliverable”.
Merge branch 'master' into refactor_2014
Remove binding.pry.
Merge pull request #141 from refinery/refactor_2014

Refactor #2
Remove pry and pry-nav from main Gemfile, in favour of .gemfile
Only run against 2.1.0 and 2.0.0 on Travis CI.
config.show_placeholders = false fix

config.show_placeholders only should hide the placeholder. Nor the input field too.
Condition now only evaluates :placeholder option.
Merge pull request #142 from pedropaG/patch-2

config.show_placeholders = false fix