Highly restructured server
Restructured server

Merge branch 'dev.gening'
Conflicts:
	server/api/user.py