add Upload Video
add upload merge branch 'master' of http://github.com/Ningning-Xia/Calendar