Error Handling File Upload
Merge branch 'master' of https://github.com/tdwuethr/HSLU.git

Conflicts:
	upload/inc/type.inc.php