upload function is added
Merge https://github.com/wangda8791/videoeditor

Conflicts:
	controller.php
	image/xparent.gif
	index.php
'-'