Updated project
Merge branch 'master' of https://github.com/jschaedl/php-uploadmanager

Conflicts:
	Zit_Misc_Upload_Manager.php