Changed pricePerUnit to price in client-server API.
Merge remote-tracking branch 'origin/master'