Merged.
Merge branch 'dev-frontend'

Conflicts:
	server.py
Caused I botched the last commit lolz.