Add 2 files
Change config 2
master config commit
Merge branch 'develop'

Conflicts:
	core/config - Copy.php