commit
nb config
Merge branch 'develop' of github.com:faclib/fac-skeleton into develop

Conflicts:
	composer.json