Merge branch 'master' of https://github.com/artivisi/training-djbc-2014-01

Conflicts:
	aplikasi-gudang/src/main/java/id/go/customs/training/gudang/aplikasi/gudang/dao/BarangDao.java
	aplikasi-gudang/src/main/java/id/go/customs/training/gudang/aplikasi/gudang/dao/KonfigurasiDatabaseConstants.java
	aplikasi-gudang/src/main/java/id/go/customs/training/gudang/aplikasi/gudang/demo/DemoAksesDb.java
	aplikasi-gudang/src/main/sql/skema-oracle.sql
Merge branch 'master' of https://github.com/artivisi/training-djbc-2014-01
Merge branch 'master' of https://github.com/artivisi/training-djbc-2014-01

Conflicts:
	aplikasi-gudang/src/main/java/id/go/customs/training/gudang/aplikasi/gudang/dao/BarangDao.java
	aplikasi-gudang/src/main/java/id/go/customs/training/gudang/aplikasi/gudang/dao/KonfigurasiDatabaseConstants.java
	aplikasi-gudang/src/main/java/id/go/customs/training/gudang/aplikasi/gudang/demo/DemoAksesDb.java
	aplikasi-gudang/src/main/sql/skema-oracle.sql
Merge branch 'master' of https://github.com/artivisi/training-djbc-2014-01

Conflicts:
	aplikasi-gudang/src/main/java/id/go/customs/training/gudang/aplikasi/gudang/demo/BarangDaoDemo.java