ok
Merge branch 'master' of https://github.com/artivisi/training-web-basic-2014-01
table RiwayatJabatan
Merge branch 'master' of https://github.com/artivisi/training-web-basic-2014-01

Conflicts:
	src/main/resources/tandajasa-ctx.xml
Merge branch 'master' of https://github.com/artivisi/training-web-basic-2014-01

Conflicts:
	src/main/resources/tandajasa-ctx.xml