All Master and tracking file

With validations
Merge remote-tracking branch 'origin/master'

Conflicts:
	sample-invoice-tracking.php