--
Merge branch 'master' of https://github.com/wangda8791/videoeditor

Conflicts:
	controller.php