Small changes
Small changes
Merge branch 'development' of https://github.com/QuatreCentQuatre/caspian into development

Conflicts:
	vendor/autoload.php