Replaced "cash register" with "point of sale"
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	merchant/reference/api.md