revert versions to -dev
Merge remote-tracking branch 'origin/master'

Conflicts:
	sonar-project.properties