DJR:Added new defaults
DJR:Added new object types
Merge branch 'master' into developer/dan