Initial commit
image directory
Merge branch 'master' of https://github.com/ikhsanpratama/siak_admin

Conflicts:
	modules/controllers/json/roles/user_controller.php
	modules/controllers/workshop_controller.php
	modules/models/roles/user.php
	modules/views/js/Application.js
	modules/views/js/controller/roles/UserController.js
tambah form cetak nilai dks
Merge branch 'master' of https://github.com/ikhsanpratama/siak_admin

Conflicts:
	modules/views/js/controller/CetakNilaiController.js