added include of env file so that compile switches actually work
Merge branch 'temp' into kseghetti/PortToOpenGLES2
pulling in changes from detached head (improve makefile)
Merge remote-tracking branch 'ktsworldfoundry/kseghetti/PortToOpenGLES2' into kseghetti/PortToOpenGLES2Phase2
Merge remote-tracking branch 'ktsworldfoundry/kseghetti/PortToOpenGLES2Phase2' into kseghetti/PortToOpenGLES2Phase2
merge from desktop machine