Change sp view condition
Merge remote-tracking branch 'origin/localgood-master' into localgood-master

Conflicts:
	config.php
Merge remote-tracking branch 'origin/localgood-master' into localgood-master