some vbo setup
fixes
Merge branch 'geoments' into world_rooms

Conflicts:
	cpp/rendererAbstract.cpp
	cpp/rendererGL.cpp
	data/levels/level2/level.xml
merge
time couting fix