modify mycenter module
Merge branch 'feature-mycollection' into develop
Merge branch 'develop' of https://github.com/balloonsys/LifeAssistant into develop
modify my search module
fix merge problems
modify merge issue
finish mycollection module
Merge branch 'feature-mycollection' into develop
Merge branch 'develop' of https://github.com/balloonsys/LifeAssistant into develop