Added data migration options
Updated logic for updating overlays
Merge branch '2-Basin'

Conflicts:
	GeoSpring/Base.lproj/Main_iPad.storyboard
	GeoSpring/GSViewController.m