Merge branch 'master' of https://github.com/ramesesinc/shared

Conflicts:
	client/client-system/nbproject/genfiles.properties
	client/rameses-client-menu/src/system/home/HomePage.form
	client/rameses-client-menu/src/system/home/HomePage.java
	client/rameses-enterprise-admin/nbproject/project.properties
	client/rameses-enterprise-entity/nbproject/build-impl.xml
	client/rameses-enterprise-entity/nbproject/genfiles.properties
	client/rameses-enterprise-entity/nbproject/project.properties
	client/rameses-enterprise-entity/nbproject/project.xml
	client/rameses-enterprise-treasury/src/com/rameses/enterprise/treasury/cashreceipt/cashreceipt.gtpl
	client/rameses-enterprise-treasury/src/workunits/cashreceipt_initial.xml
	client/rameses-gov-lgu/nbproject/project.properties
	client/rameses-gov-treasury/src/com/rameses/gov/treasury/ris/AFReceiptPage.form
	client/rameses-gov-treasury/src/com/rameses/gov/treasury/ris/AFReceiptPage.java
	client/rameses-gov-treasury/src/com/rameses/gov/treasury/ris/AFReceiptPage.style
	client/rameses-gov-treasury/src/workunits/cashreceipt_select_af.xml
	client/rameses-gov-treasury/src/workunits/ris_af_issue.xml
	client/rameses-gov-treasury/src/workunits/ris_af_purchase.xml
	client/rameses-gov-treasury/src/workunits/ris_initial.xml
	client/rameses-gov-treasury/src/workunits/ris_type_af.xml
Merge branch 'master' of https://github.com/ramesesinc/shared

Conflicts:
	client/client-system/nbproject/genfiles.properties
	client/rameses-enterprise-admin/nbproject/project.properties
	client/rameses-enterprise-entity/nbproject/build-impl.xml
	client/rameses-enterprise-entity/nbproject/genfiles.properties
	client/rameses-enterprise-entity/nbproject/project.properties
	client/rameses-enterprise-treasury/src/com/rameses/enterprise/treasury/cashreceipt/cashreceipt.gtpl
	client/rameses-gov-treasury/src/com/rameses/gov/treasury/ris/AFReceiptPage.java
	client/rameses-gov-treasury/src/workunits/ris_af_issue.xml
	client/rameses-gov-treasury/src/workunits/ris_af_purchase.xml
	client/rameses-gov-treasury/src/workunits/ris_type_af.xml
Merge branch 'master' of https://github.com/ramesesinc/shared

Conflicts:
	client/rameses-enterprise-entity/src/workunits/individual_list.xml
	client/rameses-enterprise-entity/src/workunits/juridical_list.xml
	client/rameses-enterprise-entity/src/workunits/multiple_list.xml
updated the rameses-enterprise-entity
upated the rameses-gov-lgu
Merge branch 'master' of https://github.com/ramesesinc/shared
updated the HomeControllerImpl.groovy
updated the LookupController to handle the query parameters