Added java to base
Merge branch 'master' of https://github.com/syncloud/image-base

Conflicts:
	setup.py