edit
Merge branch 'master' of https://github.com/rumahkecil/kpu

Conflicts:
	kpuapp/controllers/admin/reports.php
	kpuapp/controllers/admin/voters.php
	kpuapp/models/voter_model.php
	kpuapp/views/admin/reports.php
edit jasper reports.php