Resolving conflict
Merge branch 'master' of https://github.com/taiyode/ClubBiz

Merging commits
Merge branch 'master' of https://github.com/taiyode/ClubBiz

Resolved conflict