Delete config.php
Merge branch 'master' into dev

Conflicts:
	config-sample.php