update
update
update
update
Merge branch 'master' of https://github.com/jeesay/vertigo

Conflicts:
	vertigo/scenegraph/Camera.java
	vertigo/scenegraph/shapes/Pyramid.java