Added Junit Tests + ContinentMap modes
Merge remote-tracking branch 'origin/master'

Conflicts:

	DataVisualizer/src/shellshock/datavisualizer/client/StaticFTJHandler.java