Working on parsing STL
Merge branch 'master' of https://github.com/nieknooijens/SM42GLES

Conflicts:
	workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/GLES_test/.indexes/e4/83/da/66/history.index
	workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/GLES_test/.indexes/e4/83/da/fe/history.index
	workspace/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	workspace/GLES_test/bin/GLES_test.apk
	workspace/GLES_test/bin/classes.dex