fixed issue in registration where 'email is taken' error is showing up instead of username is taken due to emails having their own validations and username check fails on mongoose uniqueness mongodb error constraint
Merge pull request #796 from lirantal/bugfix-781-username-already-taken

fixed #781 issue in registration where 'email is taken' error is showing up wrongly
Update meanUser.js

Fix logic to show/hide auth providers display. The current conditional on line 17 "... indexOf(defaultPrefix) !== -1)" shows the buttons when using "DEFAULT_" and hides the buttons when properly configured
Merge pull request #801 from cklanac/patch-1

Update meanUser.js
Update passport.js to handle errors 

Updated  strategies to handle error when user tries to authenticate with a strategy after he has used his email to authenticate using other strategies.
Merge pull request #806 from exoer/patch-2

Update passport.js to handle errors
Adding mean.json and mean-admin core dependency
Merge remote-tracking branch 'upstream/master'