Updated custom-app to work with entities
Merge remote-tracking branch 'origin/dev' into dev