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

Conflicts:
	aplikasi-pos/src/main/sql/skema-oracle.sql
sql