Merge branch 'master' of https://github.com/nieknooijens/SM42GLES

Conflicts:
	workspace/.metadata/.plugins/org.eclipse.cdt.core/.log

	workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/GLES_test/.indexes/e4/83/da/66/history.index

	workspace/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources

	workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs
	workspace/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	workspace/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt

	workspace/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
	workspace/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml