some stuff
Merge branch 'dev' of https://github.com/vrap/the-blender into dev