updating files
Merge branch 'master' of https://github.com/geoctrl/bill

Conflicts:
	api/index.php
	billy/main.php