finish testing for user.js
finish testing user.js
finish testing for user.js
Merge branch 'DatabaseServer' of https://github.com/skiadas/PanthR.git
into DatabaseServer

Conflicts:
	source/libs/user.js