remove attrib diff
config
Merge branch 'remove-diff'

Conflicts:
	www/config.data.php