Merge pull request #21 from ritnorthstar/cc-json-expan-merge

JSONExpand + master merge
Merge pull request #22 from ritnorthstar/cc-json-endpoint-update

Support new beacon format in JSON api endpoint.
Merge master.