Merge branch 'refs/heads/master' into jan
better shader
Merge branch 'refs/heads/jan'
Merge remote-tracking branch 'origin/master' into albert

Conflicts:
	assets/data/shader/phong_ps.glsl
	src/net/kibotu/android/albert/Perspective3DCamera.java
	src/net/kibotu/android/albert/ViWiTraMain.java
	src/net/kibotu/android/albert/ViWiTraMainViewRenderer.java
fehlbenennung behoben