adapt for iOS7.1
Merge branch 'master' of https://github.com/wesleysui/MarketManager

Conflicts:
	MarketManager.xcodeproj/project.pbxproj
	MarketManager/MapViewController.swift