-- commit
-- log
Merge branch 'master' of https://github.com/choirudin2210/siaek

Conflicts:
	protected/runtime/application.log
	protected/views/kegiatan/_form.php