web.config and .htaccess bug fixes
Merge pull request #980 from stevewithington/develop

web.config and .htaccess bug fixes