Fixing up some memory usage issues, temporarily disabling zipo and bottle-morphing for debugging reasons.
Merge branch 'master' of https://github.com/UMLComputerGraphics/GraphicsProject
Merge.