Merge branch 'master' of http://github.com/MacLemonTechnology/fees-manager