Merging Updates

Merging updates from X-Toolkit.

- Remove .HTML and .JSON resource files.  This belongs in it’s own
service.
- Rename getConfiguration() -> getContextState()
- Better “NULL” support when values can’t be found.
- misc comments & formatting