Merge pull request #1007 from stevewithington/develop

bug fix: session.dashboardSpan undefined
formbuilder dataset issue, better file finding for custom dataset includes
Merge pull request #1010 from grantshepert/develop

formbuilder dataset issue, better file finding for custom dataset includ...
bug fix for issue #1005: contentRenderer heading vars
Merge branch 'develop' of git://github.com/blueriver/MuraCMS into develop