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

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