Update app using DAO
Merge branch 'develop'