fixed BarangService doesn't set namaBarang properly
Merge branch 'master' of https://github.com/reximir/IF3110-Tubes-III

Conflicts:
	Client/src/com/frexesc/controller/UpdateCart.java
Merge branch 'master' of https://github.com/reximir/IF3110-Tubes-III

Conflicts:
	Client/src/com/frexesc/controller/DeleteBarang.java