Merge branch 'release/0.4' into develop
Updated apps version number
Merge branch 'develop'