Changing solution version
Changed project version
Merge branch 'dev-jens' into dev