Merge origin/master

Conflicts:
	aplikasi-training-management/src/main/sql/skema-oracle.sql
Merge branch 'master' of https://github.com/artivisi/training-java-fundamental-2014-02
Merge origin/master