new app tree, added local_settings example
Merge remote with local