Improvements, bugfixes
Merge branch 'master' of https://github.com/emi420/undertv

Conflicts:
	data.sql3
	webserver.py