stop tracking pom.properties
Merge commit '1b76c0bb07d0c034df47a2398ddf48674f19b2ba' into dev_v1.0.4

Conflicts:
	OcsDemo/target/maven-archiver/pom.properties