Initial framework
Fixed Error with Activity not in manifest
Merge in master.
Replace tabs with spaces.  Alphabetize methods and fields.  Add spaces in statements.
Last merge with master.
Merge pull request #21 from ritnorthstar/cc-json-expan-merge

JSONExpand + master merge