modified:   Pin5iClient.xcodeproj/project.pbxproj
	modified:   Pin5iClient.xcodeproj/project.xcworkspace/xcuserdata/mamong.xcuserdatad/UserInterfaceState.xcuserstate
	modified:   Pin5iClient/.DS_Store
	deleted:    Pin5iClient/third/.DS_Store
	deleted:    Pin5iClient/third/ASIHTTPRequest/.DS_Store
	deleted:    Pin5iClient/third/ASIHTTPRequest/ASIAuthenticationDialog.h
	deleted:    Pin5iClient/third/ASIHTTPRequest/ASIAuthenticationDialog.m
	deleted:    Pin5iClient/third/ASIHTTPRequest/ASICacheDelegate.h
	deleted:    Pin5iClient/third/ASIHTTPRequest/ASIDataCompressor.h
	deleted:    Pin5iClient/third/ASIHTTPRequest/ASIDataCompressor.m
	deleted:    Pin5iClient/third/ASIHTTPRequest/ASIDataDecompressor.h
	deleted:    Pin5iClient/third/ASIHTTPRequest/ASIDataDecompressor.m
	deleted:    Pin5iClient/third/ASIHTTPRequest/ASIDownloadCache.h
	deleted:    Pin5iClient/third/ASIHTTPRequest/ASIDownloadCache.m
	deleted:    Pin5iClient/third/ASIHTTPRequest/ASIFormDataRequest.h
	deleted:    Pin5iClient/third/ASIHTTPRequest/ASIFormDataRequest.m
	deleted:    Pin5iClient/third/ASIHTTPRequest/ASIHTTPRequest.h
	deleted:    Pin5iClient/third/ASIHTTPRequest/ASIHTTPRequest.m
	deleted:    Pin5iClient/third/ASIHTTPRequest/ASIHTTPRequestConfig.h
	deleted:    Pin5iClient/third/ASIHTTPRequest/ASIHTTPRequestDelegate.h
	deleted:    Pin5iClient/third/ASIHTTPRequest/ASIInputStream.h
	deleted:    Pin5iClient/third/ASIHTTPRequest/ASIInputStream.m
	deleted:    Pin5iClient/third/ASIHTTPRequest/ASINetworkQueue.h
	deleted:    Pin5iClient/third/ASIHTTPRequest/ASINetworkQueue.m
	deleted:    Pin5iClient/third/ASIHTTPRequest/ASIProgressDelegate.h
	deleted:    Pin5iClient/third/ASIHTTPRequest/ASIWebPageRequest/ASIWebPageRequest.h
	deleted:    Pin5iClient/third/ASIHTTPRequest/ASIWebPageRequest/ASIWebPageRequest.m
	deleted:    Pin5iClient/third/ASIHTTPRequest/CloudFiles/ASICloudFilesCDNRequest.h
	deleted:    Pin5iClient/third/ASIHTTPRequest/CloudFiles/ASICloudFilesCDNRequest.m
	deleted:    Pin5iClient/third/ASIHTTPRequest/CloudFiles/ASICloudFilesContainer.h
	deleted:    Pin5iClient/third/ASIHTTPRequest/CloudFiles/ASICloudFilesContainer.m
	deleted:    Pin5iClient/third/ASIHTTPRequest/CloudFiles/ASICloudFilesContainerRequest.h
	deleted:    Pin5iClient/third/ASIHTTPRequest/CloudFiles/ASICloudFilesContainerRequest.m
	deleted:    Pin5iClient/third/ASIHTTPRequest/CloudFiles/ASICloudFilesContainerXMLParserDelegate.h
	deleted:    Pin5iClient/third/ASIHTTPRequest/CloudFiles/ASICloudFilesContainerXMLParserDelegate.m
	deleted:    Pin5iClient/third/ASIHTTPRequest/CloudFiles/ASICloudFilesObject.h
	deleted:    Pin5iClient/third/ASIHTTPRequest/CloudFiles/ASICloudFilesObject.m
	deleted:    Pin5iClient/third/ASIHTTPRequest/CloudFiles/ASICloudFilesObjectRequest.h
	deleted:    Pin5iClient/third/ASIHTTPRequest/CloudFiles/ASICloudFilesObjectRequest.m
	deleted:    Pin5iClient/third/ASIHTTPRequest/CloudFiles/ASICloudFilesRequest.h
	deleted:    Pin5iClient/third/ASIHTTPRequest/CloudFiles/ASICloudFilesRequest.m
	deleted:    Pin5iClient/third/ASIHTTPRequest/Reachability.h
	deleted:    Pin5iClient/third/ASIHTTPRequest/S3/ASINSXMLParserCompat.h
	deleted:    Pin5iClient/third/ASIHTTPRequest/S3/ASIS3Bucket.h
	deleted:    Pin5iClient/third/ASIHTTPRequest/S3/ASIS3Bucket.m
	deleted:    Pin5iClient/third/ASIHTTPRequest/S3/ASIS3BucketObject.h
	deleted:    Pin5iClient/third/ASIHTTPRequest/S3/ASIS3BucketObject.m
	deleted:    Pin5iClient/third/ASIHTTPRequest/S3/ASIS3BucketRequest.h
	deleted:    Pin5iClient/third/ASIHTTPRequest/S3/ASIS3BucketRequest.m
	deleted:    Pin5iClient/third/ASIHTTPRequest/S3/ASIS3ObjectRequest.h
	deleted:    Pin5iClient/third/ASIHTTPRequest/S3/ASIS3ObjectRequest.m
	deleted:    Pin5iClient/third/ASIHTTPRequest/S3/ASIS3Request.h
	deleted:    Pin5iClient/third/ASIHTTPRequest/S3/ASIS3Request.m
	deleted:    Pin5iClient/third/ASIHTTPRequest/S3/ASIS3ServiceRequest.h
	deleted:    Pin5iClient/third/ASIHTTPRequest/S3/ASIS3ServiceRequest.m
	deleted:    Pin5iClient/third/ASIHTTPRequest/Tests/ASICloudFilesRequestTests.h
	deleted:    Pin5iClient/third/ASIHTTPRequest/Tests/ASICloudFilesRequestTests.m
	deleted:    Pin5iClient/third/ASIHTTPRequest/Tests/ASIDataCompressorTests.h
	deleted:    Pin5iClient/third/ASIHTTPRequest/Tests/ASIDataCompressorTests.m
	deleted:    Pin5iClient/third/ASIHTTPRequest/Tests/ASIDownloadCacheTests.h
	deleted:    Pin5iClient/third/ASIHTTPRequest/Tests/ASIDownloadCacheTests.m
	deleted:    Pin5iClient/third/ASIHTTPRequest/Tests/ASIFormDataRequestTests.h
	deleted:    Pin5iClient/third/ASIHTTPRequest/Tests/ASIFormDataRequestTests.m
	deleted:    Pin5iClient/third/ASIHTTPRequest/Tests/ASIHTTPRequestTests.h
	deleted:    Pin5iClient/third/ASIHTTPRequest/Tests/ASIHTTPRequestTests.m
	deleted:    Pin5iClient/third/ASIHTTPRequest/Tests/ASINetworkQueueTests.h
	deleted:    Pin5iClient/third/ASIHTTPRequest/Tests/ASINetworkQueueTests.m
	deleted:    Pin5iClient/third/ASIHTTPRequest/Tests/ASIS3RequestTests.h
	deleted:    Pin5iClient/third/ASIHTTPRequest/Tests/ASIS3RequestTests.m
	deleted:    Pin5iClient/third/ASIHTTPRequest/Tests/ASITestCase.h
	deleted:    Pin5iClient/third/ASIHTTPRequest/Tests/ASITestCase.m
	deleted:    Pin5iClient/third/ASIHTTPRequest/Tests/ASIWebPageRequestTests.h
	deleted:    Pin5iClient/third/ASIHTTPRequest/Tests/ASIWebPageRequestTests.m
	deleted:    Pin5iClient/third/ASIHTTPRequest/Tests/BlocksTests.h
	deleted:    Pin5iClient/third/ASIHTTPRequest/Tests/BlocksTests.m
	deleted:    Pin5iClient/third/ASIHTTPRequest/Tests/ClientCertificateTests.h
	deleted:    Pin5iClient/third/ASIHTTPRequest/Tests/ClientCertificateTests.m
	deleted:    Pin5iClient/third/ASIHTTPRequest/Tests/GHUnitTestMain.m
	deleted:    Pin5iClient/third/ASIHTTPRequest/Tests/PerformanceTests.h
	deleted:    Pin5iClient/third/ASIHTTPRequest/Tests/PerformanceTests.m
	deleted:    Pin5iClient/third/ASIHTTPRequest/Tests/ProxyTests.h
	deleted:    Pin5iClient/third/ASIHTTPRequest/Tests/ProxyTests.m
	deleted:    Pin5iClient/third/ASIHTTPRequest/Tests/StressTests.h
	deleted:    Pin5iClient/third/ASIHTTPRequest/Tests/StressTests.m
	deleted:    Pin5iClient/third/HEXCMyUIButton/.DS_Store
	deleted:    Pin5iClient/third/HEXCMyUIButton/HEXCMyCustomTabBarControllerViewController.h
	deleted:    Pin5iClient/third/HEXCMyUIButton/HEXCMyCustomTabBarControllerViewController.m
	deleted:    Pin5iClient/third/HEXCMyUIButton/HEXCMyUIButton.h
	deleted:    Pin5iClient/third/HEXCMyUIButton/HEXCMyUIButton.m
	deleted:    Pin5iClient/third/HTMLParser/.DS_Store
	deleted:    Pin5iClient/third/HTMLParser/HTMLParseHelp.h
	deleted:    Pin5iClient/third/HTMLParser/HTMLParseHelp.m
	deleted:    Pin5iClient/third/HTMLParser/TFHpple.h
	deleted:    Pin5iClient/third/HTMLParser/TFHpple.m
	deleted:    Pin5iClient/third/HTMLParser/TFHppleElement.h
	deleted:    Pin5iClient/third/HTMLParser/TFHppleElement.m
	deleted:    Pin5iClient/third/HTMLParser/XPathQuery.h
	deleted:    Pin5iClient/third/HTMLParser/XPathQuery.m
	deleted:    Pin5iClient/third/JNJProgressButton/JNJProgressButton.h
	deleted:    Pin5iClient/third/JNJProgressButton/JNJProgressButton.m
	deleted:    Pin5iClient/third/MJRefresh/.DS_Store
	deleted:    Pin5iClient/third/MJRefresh/MJRefresh.bundle/arrow.png
	deleted:    Pin5iClient/third/MJRefresh/MJRefresh.bundle/arrow@2x.png
	deleted:    Pin5iClient/third/MJRefresh/MJRefresh.bundle/end_refreshing.wav
	deleted:    Pin5iClient/third/MJRefresh/MJRefresh.bundle/normal.wav
	deleted:    Pin5iClient/third/MJRefresh/MJRefresh.bundle/pull.wav
	deleted:    Pin5iClient/third/MJRefresh/MJRefresh.bundle/refreshing.wav
	deleted:    Pin5iClient/third/MJRefresh/MJRefresh.h
	deleted:    Pin5iClient/third/MJRefresh/MJRefreshBaseView.h
	deleted:    Pin5iClient/third/MJRefresh/MJRefreshBaseView.m
	deleted:    Pin5iClient/third/MJRefresh/MJRefreshFooterView.h
	deleted:    Pin5iClient/third/MJRefresh/MJRefreshFooterView.m
	deleted:    Pin5iClient/third/MJRefresh/MJRefreshHeaderView.h
	deleted:    Pin5iClient/third/MJRefresh/MJRefreshHeaderView.m
	deleted:    Pin5iClient/third/PPRevealSideviewController/.DS_Store
	deleted:    Pin5iClient/third/PPRevealSideviewController/PPRevealSideViewController.h
	deleted:    Pin5iClient/third/PPRevealSideviewController/PPRevealSideViewController.m
	deleted:    Pin5iClient/third/SCGIFImageView/.DS_Store
	deleted:    Pin5iClient/third/SCGIFImageView/SCGIFImageView.h
	deleted:    Pin5iClient/third/SCGIFImageView/SCGIFImageView.m
	deleted:    Pin5iClient/third/STKeychain.h
	deleted:    Pin5iClient/third/STKeychain.m
	deleted:    Pin5iClient/third/SpinKit/.DS_Store
	deleted:    Pin5iClient/third/SpinKit/RTSpinKitView.h
	deleted:    Pin5iClient/third/SpinKit/RTSpinKitView.m
	deleted:    Pin5iClient/third/SwipeView/.DS_Store
	deleted:    Pin5iClient/third/SwipeView/SwipeView.h
	deleted:    Pin5iClient/third/SwipeView/SwipeView.m
	new file:   Pin5iClient/viewcontroller/AboutViewController.h
	new file:   Pin5iClient/viewcontroller/AboutViewController.m
	new file:   Pin5iClient/viewcontroller/AboutViewController.xib
	modified:   Pin5iClient/viewcontroller/BookDetailViewController.m
	new file:   Pin5iClient/viewcontroller/EmailBoxViewController.h
	new file:   Pin5iClient/viewcontroller/EmailBoxViewController.m
	new file:   Pin5iClient/viewcontroller/EmailBoxViewController.xib
	new file:   Pin5iClient/viewcontroller/ExchangeViewController.h
	new file:   Pin5iClient/viewcontroller/ExchangeViewController.m
	new file:   Pin5iClient/viewcontroller/ExchangeViewController.xib
	new file:   Pin5iClient/viewcontroller/SettingsViewController.h
	new file:   Pin5iClient/viewcontroller/SettingsViewController.m
	new file:   Pin5iClient/viewcontroller/SettingsViewController.xib
	new file:   Pin5iClient/viewcontroller/UserCenterTabViewController.xib
	new file:   Pin5iClient/viewcontroller/UserInfoViewController.h
	new file:   Pin5iClient/viewcontroller/UserInfoViewController.m
	new file:   Pin5iClient/viewcontroller/UserInfoViewController.xib
	modified:   README.md

 Untracked files:
Merge branch 'master' of github.com:Mamong/pin5i-client

Conflicts:
	README.md

	modified:   Pin5iClient.xcodeproj/project.xcworkspace/xcuserdata/mamong.xcuserdatad/UserInterfaceState.xcuserstate
	modified:   README.md