SQL scripts
SQL scripts
Debugs
Marven Updates
Merge remote-tracking branch 'upstream/master'

Conflicts:
	javacountdown-ee6/pom.xml
Changes from upstream
Changes to property files
Application Properties Removed
Imports geoposition data into MongoDB
Adds dependencies for MongoDB and Morphia
Migration to MongoDB
Merge branch 'master' of https://github.com/atheedom/javacountdown.git

Conflicts:
	javacountdown-ee6/pom.xml
	javacountdown-ee6/src/main/java/org/adoptopenjdk/javacountdown/ImportGeoData.java
	javacountdown-ee6/src/main/java/org/adoptopenjdk/javacountdown/JSONUtility.java
	javacountdown-ee6/src/main/java/org/adoptopenjdk/javacountdown/boundary/VersionResource.java
	javacountdown-ee6/src/main/java/org/adoptopenjdk/javacountdown/control/DataProvider.java
	javacountdown-ee6/src/main/java/org/adoptopenjdk/javacountdown/control/GeoPositionDAO.java
	javacountdown-ee6/src/main/java/org/adoptopenjdk/javacountdown/control/MorphiaDatastore.java
	javacountdown-ee6/src/main/java/org/adoptopenjdk/javacountdown/control/ResultCache.java
	javacountdown-ee6/src/main/java/org/adoptopenjdk/javacountdown/control/VisitDAO.java
	javacountdown-ee6/src/main/java/org/adoptopenjdk/javacountdown/control/VisitTransfer.java
	javacountdown-ee6/src/main/java/org/adoptopenjdk/javacountdown/entity/GeoPosition.java
	javacountdown-ee6/src/main/java/org/adoptopenjdk/javacountdown/entity/Location.java
	javacountdown-ee6/src/main/java/org/adoptopenjdk/javacountdown/entity/VersionInfo.java
	javacountdown-ee6/src/main/java/org/adoptopenjdk/javacountdown/entity/Visit.java
	javacountdown-ee6/src/main/webapp/js/main.js
Merge remote-tracking branch 'upstream/master'

Conflicts:
	javacountdown-ee6/src/main/java/org/adoptopenjdk/javacountdown/boundary/VersionResource.java
	javacountdown-ee6/src/main/java/org/adoptopenjdk/javacountdown/control/DataProvider.java
	javacountdown-ee6/src/main/java/org/adoptopenjdk/javacountdown/control/GeoPositionDAO.java
	javacountdown-ee6/src/main/java/org/adoptopenjdk/javacountdown/control/MorphiaDatastore.java
	javacountdown-ee6/src/main/java/org/adoptopenjdk/javacountdown/control/ResultCache.java
	javacountdown-ee6/src/main/java/org/adoptopenjdk/javacountdown/control/VisitDAO.java
	javacountdown-ee6/src/main/java/org/adoptopenjdk/javacountdown/control/VisitTransfer.java
	javacountdown-ee6/src/main/java/org/adoptopenjdk/javacountdown/entity/GeoPosition.java
	javacountdown-ee6/src/main/java/org/adoptopenjdk/javacountdown/entity/Visit.java
Changes overwritten from upsteam master
Revert "Changes overwritten from upsteam master"

This reverts commit 153a7805f35c9590cbc151258ba9d5bb63266c60.
Revert "Revert "Changes overwritten from upsteam master""

This reverts commit 2b73ad4d7f4130411b312a854d10dc91e3a4a81d.
Added setter method so that it can be mapped to the JSON the RESTful
service consumes.
Check for country code being null
Added all Getters/Setters to prevent JSON mapping issue
Improve the visitor stats havested issue #64