admin formulir_pembelian_rumah
Merge branch 'master' of https://github.com/salesnya/kodok_sales2

Conflicts:
	js_admin/collections/formulir_pembelian_rumah/formulir_pembelian_rumah.js
	js_admin/models/formulir_pembelian_rumah/formulir_pembelian_rumah.js
	js_admin/router.js
	js_admin/views/formulir_pembelian_rumah/formulir_pembelian_rumah.js
	js_admin/views/formulir_pembelian_rumah/list/tabletr.js
	templates_admin/formulir_pembelian_rumah/formulir_pembelian_rumah.html
	templates_admin/formulir_pembelian_rumah/list/tabletr.html