Merge branch 'master' of Z:\win7\Projekts\HES_AIP with conflicts.
Merge remote-tracking branch 'origin/master'