add some stuff
Merge branch 'master' of https://github.com/erictanweb/dfar

Conflicts:
	public/modules/billing/controllers/add-invoice.client.controller.js