Merge branch 'master' of ssh://192.168.240.178:18081/eapim/eapim-admin

# Conflicts:
#	WebContent/WEB-INF/properties/env.P.properties
#	src/main/resources/logback-dev.xml

WebContent/WEB-INF/properties/env.P.properties

@@ -1,5 +1,5 @@
 # mariadb/postgresql/oracle/db2
-db.vendor=mariadb
+db.vendor=oracle
 # db.vendor specific dialect
 # Examples
 # - H2 : org.hibernate.dialect.H2Dialect
@@ -9,10 +9,10 @@ db.vendor=mariadb
 hibernate.dialect=org.hibernate.dialect.Oracle12cDialect
 
 # Priority of the was -D option
-inst.Name=admSvr11
+inst.Name=emsSvr11
 eai.tableowner=EMSADM
 # P/T/D/S
-eai.systemmode=D
+eai.systemmode=P
 eai.drmode=N
 # black / blue / green / orange / yellow 
-theme.color=orange
+theme.color=blue