Signed-off-by: olive <olive>
Signed-off-by: olive <olive>
Signed-off-by: olive <olive>
Signed-off-by: olive <olive>
Signed-off-by: olive <olive>
Signed-off-by: olive <olive>
Signed-off-by: olive <olive>
Merge branch 'master' into native-asset-gl2

Conflicts:
	src/com/jday/framework/graphics/gl/GLRenderView.java
	src/com/jday/framework/graphics/gl2/GLTexture.java

Signed-off-by: olive <olive>
Signed-off-by: olive <olive>
Signed-off-by: olive <olive>
Signed-off-by: olive <olive>
Signed-off-by: olive <olive>
Signed-off-by: olive <olive>
Signed-off-by: olive <olive>
Signed-off-by: olive <olive>