composer.lock
Merge branch 'develop' of https://github.com/nass59/BDMania into develop

Conflicts:
	app/config/config.yml