Merge branch 'android' into dev
code in src dir
basic structure for game states
state management skeleton
normal calculations in static base class
basic cuboid building
init buttons for menus
Merge branch 'gameStates' into dev
corrected cuboid model
flat shaded buttons
Merge branch 'gameStates' into dev
maintained mac launcher & project
detach & delete shaders after they are program compilation
Merge branch 'dev' into android
stl lib for glm
corrected def check for android
non c++11 init for compilation on android
new run script
build with 8 cores
wired in engine