fix sample config
Merge branch 'master' into work

Conflicts:
	config.php

merge work branch to master