Merge branch 'hotfix/0.2.2'
Merge branch 'release/0.3.1'
Get sonar config into master
Merge branch 'master' into develop

Conflicts:
	sonar-project.properties