Basic Test
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	test/config/karma.conf.js
Merge remote-tracking branch 'origin/develop' into develop
Fixed Tests
Merge remote-tracking branch 'origin/develop' into develop