rm upyun, so progressbar works
upyun_images -> blog_images
unify edit_video and add_video
Merge branch 'upload' into tmp

Conflicts:
	config/locales/en.yml
	db/schema.rb