update protocol for production and dev
Merge branch 'master' of https://github.com/ddgriffin/GG-mvp

Conflicts:
	app/controllers/application_controller.rb