Merge remote-tracking branch 'origin/Boyko' into Peter3

Conflicts:
	public/app/viewCustomer/viewCustomer.js
Merge remote-tracking branch 'origin/Peter3'

Conflicts:
	public/app/viewCustomer/viewCustomer.js