Merge branch 'development' of http://github.com/ragulan77/athena into development
Merge branch 'development' of http://github.com/ragulan77/athena into development
composer.lock
Merge branch 'development' of http://github.com/ragulan77/athena into development

Conflicts:
	composer.lock
composer.lock
Merge branch 'development' of http://github.com/ragulan77/athena into development
composer.lock
bug note matièere