invoice and report changes
Merge branch 'master' of https://github.com/rajnar/spice

Conflicts:
	application/views/reports/index.php