Merge branch 'refs/heads/develop'
bumped version
Merge branch 'refs/heads/develop'

Conflicts:
	CHANGELOG
	README.md
	VERSION
Merge branch 'refs/heads/develop'
Merge branch 'refs/heads/develop'
Merge branch 'refs/heads/develop'
bump version
cropped overview image
Merge branch 'refs/heads/master' into develop