fix correct version to 4.0.0-SNAPSHOT
Merge remote-tracking branch 'origin/master' into feature/activity-type