Merge origin/master
Merge origin/master
Merge origin/master

Conflicts:
	aplikasi-training-management/src/main/java/com/artivisi/training/domain/Batch.java
	aplikasi-training-management/src/main/java/com/artivisi/training/domain/Catatan.java
	aplikasi-training-management/src/main/java/com/artivisi/training/domain/Peserta.java
Merge origin/master

Conflicts:
	aplikasi-training-management/src/main/java/com/artivisi/training/domain/Batch.java
	aplikasi-training-management/src/main/java/com/artivisi/training/domain/Catatan.java
	aplikasi-training-management/src/main/java/com/artivisi/training/domain/Peserta.java
Merge origin/master
Tambah skema Opsi