merge
Merge branch 'master' of https://github.com/erictanweb/dfar

Conflicts:
	public/modules/billing/views/add-salesorder.client.view.html