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

Merging commits
Changelog 7 13/05/14
- Changed variable names in controller and view
Merge branch 'master' of https://github.com/taiyode/ClubBiz

Resolved conflict
Merge pull request #1 from taiyode/master

Updated to newest version