Minor updates in a couple files
Merge branch 'development' of https://github.com/QuatreCentQuatre/caspian into development

Conflicts:
	Caspian/Utils/Upload.php
	Caspian/Views/Base.php