Merge branch 'staging' of https://github.com/ksavietta/Grab-The-List into staging

Conflicts:
	config/environments/production.rb
Merge branch 'staging' of https://github.com/ksavietta/Grab-The-List into staging