add db info in prod
add media
collect static
deployment done.settings gooooood!
set manage.py to local
remove google html5 shiv
adj database settings
adj database settings2
custom 404
Merge branch 'master' of https://github.com/wuzhuzhu/ts into dev
new static and player