Merge remote-tracking branch 'origin'

Conflicts:
	Gemfile.lock
	app/assets/javascripts/application.js
forgot password fix
Merge remote-tracking branch 'ta/master'

Conflicts:
	Gemfile.lock