migrated updates
Merge branch 'refs/heads/phong_ks_fix' into enhanced-materials

Conflicts:
	src/rajawali/materials/DiffuseMaterial.java
	src/rajawali/materials/PhongMaterial.java