jul18_1
Merge branch 'master' of https://github.com/Apixio/automation

Conflicts:
	test