implemented password encryption and added tests
added name field
Merge commit '6c9c0a7268c3f731834fe85fd0966559ff5dbdfa' into subscribe

Conflicts:
	package.json