hehe
haha
index
model-video
random_video_upload
use slim
upload_from_mo
Merge branch 'feature/VideoSys' of https://github.com/cassiuschen/mo into feature/VideoSys

Conflicts:
	config/routes.rb
upload_youku
conflict-commit
abort
music-upload1
Merge branch 'feature/MusicSys' of github.com:cassiuschen/mo into development
clean up