Add testing dependencies
First test, and test script for CI server
Merge remote-tracking branch 'origin/develop' into feature/test-framework

Conflicts:
	package.json
Fixing version number