Status message
Changed serial output
Fixed indent
REST functions
Merge branch 'master' into singlepage

Conflicts:
	server/database.py