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

Conflicts:
	src/Umeca/src/main/java/com/umeca/service/catalog/InsertCatalogServiceImpl.java
Merge branch 'master' of https://github.com/IDRASoft-P160-Um3c4/UmecaApp
Merge branch 'master' of https://github.com/IDRASoft-P160-Um3c4/UmecaApp
Merge branch 'master' of https://github.com/IDRASoft-P160-Um3c4/UmecaApp

Conflicts:
	src/Umeca/src/main/java/com/umeca/service/catalog/InsertCatalogServiceImpl.java