Apps and database updates

Signed-off-by: Arief M Utama <arief.utama@gmail.com>
Merge conflict resolution

Signed-off-by: Arief M Utama <arief.utama@gmail.com>