Merge branch 'master' of https://github.com/IDRASoft-P160-Um3c4/UmecaApp

Conflicts:
	db/status_meeting.txt
	src/Umeca/src/main/java/com/umeca/controller/catalogs/InsertCatalogController.java
	src/Umeca/src/main/java/com/umeca/service/catalog/InsertCatalogServiceImpl.java
	src/Umeca/src/main/resources/jpaContext.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	db/status_case.txt
	src/Umeca/src/main/java/com/umeca/controller/catalogs/InsertCatalogController.java
	src/Umeca/src/main/java/com/umeca/model/shared/Constants.java
	src/Umeca/src/main/java/com/umeca/service/catalog/InsertCatalogService.java
	src/Umeca/src/main/java/com/umeca/service/catalog/InsertCatalogServiceImpl.java
	src/Umeca/src/main/java/com/umeca/service/supervisor/HearingFormatServiceImpl.java
	src/Umeca/src/main/resources/jpaContext.xml
	src/Umeca/src/main/webapp/WEB-INF/jsp/reviewer/meeting/address/content.jsp
Merge branch 'master' of https://github.com/IDRASoft-P160-Um3c4/UmecaApp

Conflicts:
	db/status_meeting.txt
	src/Umeca/src/main/java/com/umeca/controller/catalogs/InsertCatalogController.java
	src/Umeca/src/main/java/com/umeca/service/catalog/InsertCatalogServiceImpl.java
	src/Umeca/src/main/resources/jpaContext.xml