七牛上传Key放入配置文件
Merge branch 'master' of github.com:zhangskills/blog

Conflicts:
	app/controllers/upload.go