Edit Product
Merge branch 'master' of https://github.com/artivisi/training-java-fundamental-2014-01
Merge branch 'master' of https://github.com/artivisi/training-java-fundamental-2014-01
Merge branch 'master' of https://github.com/artivisi/training-java-fundamental-2014-01
Merge origin/master demo
Merge branch 'master' of https://github.com/artivisi/training-java-fundamental-2014-01
Merge origin/master demo
Merge branch 'master' of https://github.com/artivisi/training-java-fundamental-2014-01

Conflicts:
	aplikasi-pos/src/main/java/com/muhardin/endy/training/pos/demo/ProdukDemo.java
	aplikasi-pos/src/main/sql/skema-oracle.sql
Merge branch 'master' of https://github.com/artivisi/training-java-fundamental-2014-01

Conflicts:
	aplikasi-pos/src/main/java/com/muhardin/endy/training/pos/demo/ProdukDemo.java
	aplikasi-pos/src/main/java/com/muhardin/endy/training/pos/helper/KoneksiDatabase.java
Merge branch 'master' of https://github.com/artivisi/training-java-fundamental-2014-01
Merge branch 'master' of https://github.com/artivisi/training-java-fundamental-2014-01

Conflicts:
	aplikasi-pos/src/main/java/com/muhardin/endy/training/pos/demo/ProdukDemo.java
	aplikasi-pos/src/main/java/com/muhardin/endy/training/pos/helper/KoneksiDatabase.java
Merge branch 'master' of https://github.com/artivisi/training-java-fundamental-2014-01
Commit region Importesting ciusss lhoh
Merge branch 'master' of https://github.com/artivisi/training-java-fundamental-2014-01
Merge branch 'master' of https://github.com/artivisi/training-java-fundamental-2014-01