v2.0 prep
Merge branch 'master' of https://github.com/ptoma98/skytap-cloud-plugin

Conflicts:
	pom.xml