Refactoring and unit tests
Merge remote-tracking branch 'origin/master'

Conflicts:
	Renderer/test/main.js