Merge branch 'master' of http://10.153.19.150:10101/r/Haier_MES

# Conflicts:
#	gmms/WebContent/WEB-INF/lib/nglib.jar
#	gmms/WebContent/mysqlInsert/toPlc.jsp