starting upload options implementation
Merge origin/master

Conflicts:
	hooks/edit.php