update
Merge branch 'master' of https://github.com/DrayChou/BeeGoTo

Conflicts:
	controllers/test.go
	models/douban/douban.go
	models/user.go
Merge branch 'master' of https://github.com/DrayChou/BeeGoTo

Conflicts:
	models/douban/douban.go