architecture
add pod install
add locationFication
Merge branch 'master' of https://github.com/dacaiguoguo/proPorject

Conflicts:
	proPorject.xcodeproj/project.pbxproj