Adding Java marathon API
Merge branch 'master' of github.com:boldpi/nginx-marathon

Conflicts:
	build.gradle