Updated Track JsonResolver to store control point data. Also implemented
a map image to be previewed in the TrackInfo -activity via url.
Merge branch 'develop' of
https://github.com/NFC-Orienteering/NFC-Orienteering.git into develop

Conflicts:
	src/org/uta/nfcorienteering/event/Checkpoint.java