Merge branch 'feature/10819_permissions' into testing
Merge branch 'feature/10608_link_checker' into testing
Merge branch 'feature/10608_link_checker' into testing
Merge branch 'feature/10863_disk_performance_improvements' into testing
Merge branch 'feature/10833_last_modified_check' into testing
Merge branch 'feature/10608_link_checker' into testing
Merge branch 'feature/10608_link_checker' into testing
Merge branch 'feature/10817_webservice' into testing

Conflicts:
	django-os2webscanner/os2webscanner/utils.py
Merge branch 'feature/10817_webservice' into testing

Conflicts:
	scrapy-webscanner/scanner/spiders/scanner_spider.py
Merge branch 'feature/10608_link_checker' into testing
Merge branch 'feature/10817_webservice' into testing
Merge branch 'feature/10817_webservice' into testing
Merge branch 'feature/10817_webservice' into testing
Merge branch 'feature/10817_webservice' into testing
Merge branch 'feature/10832_ui_fixes' into testing
Merge branch 'feature/10608_link_checker' into testing
Merge branch 'feature/10817_webservice' into testing

Conflicts:
	scrapy-webscanner/scanner/spiders/scanner_spider.py
Merge branch 'feature/10608_link_checker' into testing
Merge branch 'feature/10858_allow_subdomains' into testing

Conflicts:
	scrapy-webscanner/scanner/spiders/scanner_spider.py
Merge branch 'feature/10832_ui_fixes' into testing