added offline changes
fixed broken offline download
Merge remote-tracking branch 'origin/master' into offline
Merge branch 'master' into offline

Conflicts:
	ARIS.xcodeproj/project.pbxproj
	Info.plist
Tiny UI fix - formatted size of segmented control in Popular tab to be the same as Nearby tab.
Merge branch 'master' into develop