Further refactoring
Stuff.
Merge branch 'master' of https://github.com/tudalex/licenta

Conflicts:
	webgl/js/engine/engine.js