Added override switch to cachin mecanism
Merge branch 'development' of https://github.com/QuatreCentQuatre/caspian into development
Merge branch 'development'