[#16] Merge 'feature/update-ember-app' into 'develop'