Bump Java version to 1.7 in master pom
Merge branch 'goodbye_liferay' of https://github.com/inbloom/secure-data-service into goodbye_liferay