Merge branch 'master' into develop
Add more status images
Merge remote-tracking branch 'origin/develop'