particleemitter works so far.
Merge remote-tracking branch 'remotes/origin/particle_vbo_28' into particles

Conflicts:
	src/objectscontainer.cpp
	src/objectscontainer.h
remove camera debugger
Merge pull request #36 from lanice/hand_of_god

Hand of god
Successfully merged better drawing with existing emitters.
Merge remote-tracking branch 'remotes/origin/master' into particles
Merge remote-tracking branch 'origin' into particles

Conflicts:
	src/objectscontainer.cpp
	src/world.cpp
Create Emitter at mouse position
Merge pull request #38 from lanice/particles

Particles
Merge remote-tracking branch 'origin/master' into terrainInteraction_22

Conflicts:
	src/godmanipulator.cpp