Merge branch 'hotfix-0.0.3-p1'
removed modman
Merge branch 'hotfix-0.0.3-p2' into develop