Changing method name to hashPassword. 'encrypt' implies decryption, and pbkdf2 is not decryptable
Merge branch 'master' of http://github.com/linnovate/mean
added user id and role and name back into the user object
Merge branch 'master' of http://github.com/linnovate/mean
Merge branch 'enc'
Merge remote-tracking branch 'upstream/master'