-test
Merge branch 'master' of https://github.com/IOsonoTAN/billing

Conflicts:
	apps/index.coffee
	assets/javascripts/ui.coffee