Merge branch 'master' of https://github.com/nighthawk454/tv_server

Conflicts:
	database.py
Merge branch 'master' of https://github.com/nighthawk454/tv_server