added object table take 2.
Merge branch 'master' of https://github.com/danig/PTFake

consolidated db tables.

Conflicts:
	db.py