fixed changes merged from trollguard
Merge branch 'development' of https://github.com/genevievebelle/Scrawler-UI into development