data version inc
Merge remote-tracking branch 'origin/master' into jsonChangeSet

Conflicts:
	pubspec.yaml