Merge branch 'hotfix/fix_1458'
replaced .project in .master
Merge branch 'hotfix/hvad_mig_again' into develop