u
Merge branch 'master' of https://github.com/bcw104/scada-common

Conflicts:
	target/classes/META-INF/maven/com.ht.scada/scada-common/pom.properties
delete target