Reporting + Customer Service

Kayanya bakal ada error,kalo ada,kasih tau ya sam,btw controller
Reporting.php gak bisa ke commit
Merge branch 'pr/2'

Conflicts:
	app/controllers/BackofficeController.php