try to merge database restructure with the other stuff
Merge branch 'master' of https://github.com/jdeanwaite/eDVR

Conflicts:
	app.js
	debug/debug.log