Adding table prefix
allow for size argument on dspNestedNav
Merge pull request #966 from stevewithington/develop

allow for size argument on dspNestedNav
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
Merge branch 'develop'