Merge remote-tracking branch 'origin/latte'

Conflicts:
	Gemfile.lock
	app/controllers/programs_controller.rb
	app/views/programs/index.html.haml
	config/routes.rb
Sorcery ResetPassword partially implemented.
Still trying to implement pwd-reset using sorcery.
Pwd reset almost done using Sorcery.

Except that the email format.
Merge remote-tracking branch 'origin/latte'

Conflicts:
	Gemfile.lock
	app/assets/javascripts/page_action.js.coffee
	app/views/programs/index.html.haml
	config/routes.rb