report refactor
Merge remote-tracking branch 'origin/master'

Conflicts:
	sources/Model/Model.csproj