added license headers
changed to java7
Merge branch 'master' of github.com:vaeke/countrydata