Changing version number to make release
Merge branch 'master' into development

Conflicts:
	javasdk/NRSDK/src/com/neuronrobotics/sdk/config/build.properties