VAOs in all objects
Move doubled code to own function
Code cleanup
Merge branch 'VAOs' into develop