spaCMS Upload & Manager Image 100%
Merge remote-tracking branch 'origin/master'

Conflicts:
	Views/spaCMS/settings/index.php