merge
Merge branch 'development' of https://github.com/QuatreCentQuatre/caspian into development
fixes setup.php