Some project clean up
Added rendering for display for primitives and some basic datatypes
Cosmetic changes to generator
Merge branch 'master' into develop