#901: macro fields added to site map nodes.
Merge branch 'dev' of ssh://github.com/devbridge/BetterCMS into dev