Merge remote-tracking branch 'origin'

Conflicts:
	Gemfile.lock
	app/assets/javascripts/application.js
Removed redundant jquery.peity.min, jquery.peity
forgot password fix
Merge remote-tracking branch 'ta/master'

Conflicts:
	Gemfile.lock
Profile update fix
Merge remote-tracking branch 'rt/master'

Conflicts:
	app/assets/javascripts/application.js
	app/controllers/users_controller.rb
	app/mailers/user_mailer.rb
	app/views/dashboards/index.html.erb
	app/views/users/forgot.html.erb
	config/routes.rb
Merge remote-tracking branch 'ta/master'

Conflicts:
	app/controllers/users_controller.rb
changes