Adding table names to avoid amigious columns errors when going between branches
bug fix: utility.logevent undefined var
Merge pull request #974 from stevewithington/develop

bug fix: utility.logevent undefined var
web.config and .htaccess bug fixes
Merge pull request #980 from stevewithington/develop

web.config and .htaccess bug fixes
Removing extra closing cfif #984
Merge branch 'develop' of github.com:blueriver/MuraCMS into develop
Tweaking quick edit save post to use absolute url
Adding java wait when file is locked
bug fix: session.dashboardSpan undefined
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
Merge pull request #1012 from stevewithington/develop

bug fix for issue #1005: contentRenderer heading vars
Adding trim to filename
Merge branch 'develop' of github.com:blueriver/MuraCMS into develop
Adding trim to filename
Fix for issue #1014