Angular fixes
images
Merge branch 'feature/angular_fixes' into develop
Merge branch 'release/0.4'