Update to travis build
Merge branch 'master' of https://github.com/CharltonIT/OpenVPMS-Main

Conflicts:
	.travis.yml