upload fixed
Merge branch 'upload'

Conflicts:
	content/content.properties.php
	lib/class.file.php