Fixed Edit Customer Js Bug
Merge remote-tracking branch 'origin/master'

Conflicts:
	edit-customer.php
	js/edit-customer.js