Updating version number
Merge remote-tracking branch 'origin/develop' into feature/test-framework

Conflicts:
	package.json