Adding social oauth login.  #224 #286 #287
Merged from master.
Adding password fields to user's profile.  #418
Merge branch 'master' into issue418

Conflicts:
	app/controllers/UserController.php
Merge pull request #428 from opengovfoundation/issue418

Social Auth & Password fields.  resolves #386 resolves #287 resolves #224