fixed bugs
Merge branch 'master' of https://github.com/SKRIBLDEV/Skribl_web

Conflicts:
	server/modules/user.js