fix password bug CR: PSG
Folow & unfollow CR: PSG
Merge branch 'dev' of github.com:VAIRIX/plnproject into dev

Conflicts:
	app/assets/javascripts/users.js
	app/models/user.rb
	db/schema.rb