money
money
Merge branch 'master' of https://github.com/sheely/momey_ios

Conflicts:
	money.xcodeproj/project.pbxproj
	money.xcodeproj/project.xcworkspace/xcuserdata/zywang.xcuserdatad/UserInterfaceState.xcuserstate
	money/SystemFiles/module.xml
	money/SystemFiles/style.xml
	money/money-Info.plist
caixin