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

Conflicts:
	public/modules/customers/views/suspend-vehicle.client.view.html
add payment stuff