Minor changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	financien/over-limit.php
	sales/create-appointment.php
	sales/editcustomer.php
	sales/view.php