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

Conflicts:
	Caspian/Extender.php
caspian 5.1, see changelog
caspian 5.1, see changelog