Merge
Merge branch 'master' of git@github.com:lynntesia/Data-Tamers.git

Conflicts:
	AppliedAnalytics/target/m2e-wtp/web-resources/META-INF/maven/io.analytics/site/pom.properties