fixes JabbR/JabbR/#873
Merge branch 'dev' into ImageService
Fixes JabbR/JabbR#873 || Rolling back errant web.config change