Merge branch 'hotfix/1.0.4'
Delete .gitmodules.
Merge branch 'hotfix/1.0.5' into development