Merge branch 'master-1'
Remove Conflict at database.php PelayananCtrl.js

Remove <<<< HEAD
Merge branch 'master' of https://github.com/bassamtiano/sicantik-backoffice