Added jasmine-node to the dependencies
Merge branch 'master' of https://github.com/simonech/OpenROV-v3

Conflicts:
	package.json