jelastic plugin
Merge branch 'master' of https://github.com/picaro/cookapp-cloud

Conflicts:
	pom.xml