Re synch

Composer 1 Error
Add Post Prototype

Post Prototype at Backoffice & Prototype
Add more function at post

post at backfire entry data perizinan data away modal
JSON Modul Reporting

TMpermhonan,Trperizinan,routes
Add Option Combo

Selected When it has true value
Merge branch 'create-stage'
Merge pull request #1 from almerps/master

JSON Modul Reporting
 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
Completing Reporting

Add Function Rekapitukasi Perizinan in Reporting
Styling Edit Button & Fixing Combo Box Bug

Module had 3 Types of Button Group at aksi. Combo box had minor bug
Merge branch 'pr/3'

Conflicts:
	app/models/Tmpemohon.php
	app/models/Trsyaratperizinan.php
	app/views/konfigurasi/pages/setting_perizinan_jenis_perizinan.blade.php
Edit Konfigurasi

Edit conflict Tmpemohon Trperizinan Trsyaratperizinan
Merge pull request #1 from bassamtiano/master

Minta
Add Gitignore

Add Pelayanan
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	app/config/database.php
	public/assets/controllers/PelayananCtrl.js
Refactoring Pelayanan Customer Service

Remove var at PelayananCtrl.js
Merge branch 'master-1'
Merge branch 'pr/7' into master-1

Conflicts:

app/views/pelayanan/pages/customer_service_informasi_perizinan.blade.php
	public/assets/controllers/PelayananCtrl.js
Merge pull request #8 from bassamtiano/master-1

Master 1