Some fixes
Merge branch 'dev' of github.com:fhacktory/Rendermen into dev

Conflicts:
	src/static/js/renderer.js