Commit fix
Checkout from master
Committing Deployment class
Commit merged changes
Merge branch 'master' of ssh://git@github.com/CELAR/c-Eclipse.git

Conflicts:
	app-description/eu.celar.tosca/.project