template update
Merge branch 'template/album' into develop
#461, #471
Merge branch 'feature/photo' into develop
Merge branch 'develop' of git.sidways.lab:/patrick_ruby into develop
#356；
修改评论照片的路由bug
Merge branch 'develop' of git.sidways.lab:/patrick_ruby into develop
使用java提供的搜索服务搜索用户， 并排除未激活的用户， #325
Merge branch 'feature/debug' into develop
aa
Merge branch 'template/album' into develop
#456
发送私信的autocomplete去掉自己；
用户设置暂不验证“所在地”
my home page update
Merge branch 'template/album' into develop
#338
完善#325
Guide page template update
Merge branch 'template/album' into develop
#498, #364
#498评论回复，＃339酒窖价格排序（未完成）