修改bug
Merge branch 'master' of https://github.com/inonomori/photo2go

Conflicts:
	Photo2GO.xcodeproj/project.pbxproj
	Photo2GO/Resources/UI/pin_green.png
	Photo2GO/Resources/UI/pin_green@2x.png
	Photo2GO/Resources/UI/pin_purple.png
	Photo2GO/Resources/UI/pin_purple@2x.png
	Photo2GO/Resources/UI/pin_red.png
	Photo2GO/Resources/UI/pin_red@2x.png
	Photo2GO/en.lproj/MainStoryboard.storyboard
	Photo2GO/sources/Library/Baidu/libs/Release-iphoneos/libbaidumapapi.a
	Photo2GO/sources/Scenarios/ImageUpload/FSLocaeMapViewController.m