Fixed issues with web root settings not working.
Fixed more NoneType iterable errors.
Merge remote-tracking branch 'origin/dev'