Fixed the Java version to 7
Merge branch 'master' of https://github.com/cotrix/cotrix-gcube

Conflicts:
	cotrix-gcube/cotrix-gcube-security/.classpath
	
Fixed Java version to 7
Added Cotrix location retrieving from resource in IS