Adding missing db_orm include file and fixing up merge conflicts
Fix spaces
Merge pull request #117 from spekary/feature-ManyManyTypeTables-2

Feature many many type tables 2