Merging alexfigtree with wce-app

Merging alexfigtree with wce-app