A few nice seaweed
Merge branch 'master' of https://github.com/proto3/G3D_PROJECT

Conflicts:
	scene.h
Merge branch 'master' of https://github.com/proto3/G3D_PROJECT

Conflicts:
	scene.h
Merge branch 'master' of https://github.com/proto3/G3D_PROJECT
compile fix