Inclusion of Java Objects for Data Type Container classes (for maintainability/expandability).
Merge remote-tracking branch 'phreed/master'
adapting templates for use with ammo