updated config
Merge remote-tracking branch 'origin/1.0' into 1.0-develop

Conflicts:
	composer.lock
updated
Merge branch '1.0-develop' into 1.0