Merge pull request #52 from moqui/master

Upstream update
Merge pull request #53 from moqui/master

Upstream update
Merge pull request #14 from sssonline/master

14
Merge pull request #54 from moqui/master

Upstream update
Changed to use Node.clone() directly, improved handling of widget-template-include
Changed to use Node.clone() instead of our own deep copy approach
Small change to use newer FTL @@text instead of ?string
Cleanups, warning fixes
Merged changes
Merge remote-tracking branch 'upstream/master'