commit
Merge branch 'master' of https://github.com/voltecrus/DataScrubber

Conflicts:
	pom.xml
	src/main/java/com/pearson/datascrubber/DataScrubber.java
	src/main/java/com/pearson/datascrubber/dataMaskerRules.xml
	src/main/java/com/pearson/datascrubber/xmlParsing.java
	target/classes/com/pearson/datascrubber/DataScrubber.class