Add company id and do minor fixes for vat number
Merge branch 'master' of github.com:tlbdk/invoice-ninja
Merge branch 'master' of github.com:tlbdk/invoice-ninja

Conflicts:
	app/lang/en/texts.php
Dont print
Merge pull request #189 from tlbdk/master

Add company ID