Modify download command to preserve profile.json, and merge in new content from download profile.json if it does not conflict with current content.
Refactor "list" to add more features
Merge branch '2.0' into 2.1

Conflicts:
	package.json
Add "emote list app" command, in progress
Fix bug where "profile.json" cannot be read during "emote download app" -- we should not have been trying to read the file anyway.
Merge branch '2.0' into 2.1

Conflicts:
	package.json
Fix MMP-1243: NPE when a return type wraps a simple type
Fix bug "population of staging/ seems incorrect after building multiple project's proxies"
Fix MMP-1269.  Make parmeters which should be enums enums.
Better error message when package.json is missing from proxy.
Merge branch '2.0' into 2.1

Conflicts:
	package.json