support for researchdomains added
Merge branch 'master' of https://github.com/SKRIBLDEV/Skribl_web

Conflicts:
	server/modules/database.js