kjl
Merge remote-tracking branch 'origin/master'

Conflicts:
	basic_info.php
	css/values.css
	include/crawler/_config.php
	status.txt