Merge remote-tracking branch 'origin/albert'
changed directory
no difference on my device
added light class
added material class
loading shader from file now
bla
Merge branch 'refs/heads/jan'
re-added near and far plane for camera
Merge branch 'refs/heads/jan'
blob
Merge branch 'refs/heads/jan'
small changes for light
Merge branch 'refs/heads/jan'
fixed black artefact
Merge branch 'refs/heads/master' into jan

Conflicts:
	src/net/kibotu/android/albert/ViWiTraMainView.java
Merge remote-tracking branch 'origin/albert'

Conflicts:
	src/net/kibotu/android/albert/ViWiTraMainView.java
blabla
Merge branch 'refs/heads/jan'
Merge remote-tracking branch 'origin/master' into albert