Fixed included apps.
Merge branch 'test' into dev
schema changes to resolve cuttlefish warnings.
merge