changing 3DModelLoader addon to work with OpenGL ES
adding Android example for ofx3DModelLoader
Merge branch 'develop' into feature-android3DModelBuilder
update project generator simple
added gitignore fix for project generator submodule
Merge pull request #1781 from ofZach/updatePG

update project generator simple
fix android accelerometer units (close #1782)
ofCamera::worldToScreen() Fixes #1762
use 9.81 m/s^2 for g instead of 9.8 in ofxAndroidAccelerometer
Merge pull request #1791 from thiagohersan/bugfix-androidAccelerometerUnits

fix android accelerometer units
Merge pull request #1792 from bakercp/bugfix-ofCamera

ofCamera::worldToScreen() Fixes #1762
video examples: set vertical sync
linux: compatibility with gstreamer 1.0
gstreamer-1.0: add missing ifdef
Merge pull request #1794 from arturoc/feature-gstreamer1.0

Feature gstreamer1.0
ofGstUtils: fix incorrect ifdef
Merge branch 'feature-gstreamer1.0' into develop
Merge pull request #1024 from bostonbusmap/feature-android3DModelBuilder

Fixing 3DModelBuilder to work with OpenGL ES, added Android example for it
makefile: fix gstreamer version detection
Merge branch 'develop' of github.com:openframeworks/openFrameworks into develop