Merge pull request #509 from ovatsus/master

Attempt to fix #507
Seriously Freebase?
Fix bad printing of option.Value as None
Always generate default constructor when possible
Expose Json embedded in Xml (closes #412) + Improve supported collection cases in xml
Merge pull request #512 from ovatsus/JsonInXml

Json in xml
Reuse file system watchers across different TP instances using the same sample file (#300)