module management
Merge branch 'dev' into Modules

Conflicts:
	client/main/routes.js
	server/-/server/server.js