Merge remote-tracking branch 'origin/master' into scenegraph

Conflicts:
	src/rajawali/ATransformable3D.java
	src/rajawali/math/Quaternion.java

Signed-off-by: Jared Woolston <jwoolston@tenkiv.com>