Removed billingCtrl.php
Merge branch 'master' of github.com:leocss/elibrary-web
Fixed merge conflicts