Merge branch 'master' of https://github.com/ostdlabs/customer-monitor

Conflicts:
	pom.xml
Merge branch 'master' of https://github.com/ostdlabs/customer-monitor
fix pom.xml