# Conflicts:
#	library/Billrun/Calculator/Rate/Usage.php
#	library/Billrun/Cycle/Account/Invoice.php
#	library/Billrun/Cycle/Data/Plan.php
#	library/Billrun/DiscountManager.php
#	library/Billrun/Version.php
#	public/bundle.app.js
#	public/bundle.vendor.js
#	public/globalSettings.js
#	public/index.html