more bugs fixed drag and drop
Merge branch 'develop' into new-Implementation-Module
hotfix warnings
Merge branch 'new-Implementation-Module' into develop