Working data flow

pipes cleaned
History edited

Working history with basic scroll
History formatted
Post History page

adding data upload now
data r

d
safezone

jkl;
downloading from stackmob
Merge branch 'master' into Dev

Conflicts:
	BayTrade.xcodeproj/project.pbxproj

BayTrade.xcodeproj/xcuserdata/pabrai.xcuserdatad/xcdebugger/Breakpoints.
xcbkptlist
	BayTrade/BT_AppDelegate.m
	BayTrade/BT_FirstViewController.h
	BayTrade/BT_FirstViewController.m
	BayTrade/BT_TabBarController.m
	BayTrade/BT_ThirdViewController.h
	BayTrade/BT_ThirdViewController.m
	BayTrade/BT_TradeEvent.h
	BayTrade/BT_TradeEvent.m
	BayTrade/Model.h
	BayTrade/Model.m
	BayTrade/en.lproj/MainStoryboard.storyboard
	StackMob-v2.0.0/CHANGELOG.md
	StackMob-v2.0.0/Headers/AFHTTPClient+StackMob.h
	StackMob-v2.0.0/Headers/AFHTTPRequestOperation+RemoveContentType.h
	StackMob-v2.0.0/Headers/AFNetworking/AFHTTPClient.h
	StackMob-v2.0.0/Headers/AFNetworking/AFHTTPRequestOperation.h
	StackMob-v2.0.0/Headers/AFNetworking/AFImageRequestOperation.h
	StackMob-v2.0.0/Headers/AFNetworking/AFJSONRequestOperation.h

StackMob-v2.0.0/Headers/AFNetworking/AFNetworkActivityIndicatorManager.h
	StackMob-v2.0.0/Headers/AFNetworking/AFNetworking.h
	StackMob-v2.0.0/Headers/AFNetworking/AFPropertyListRequestOperation.h
	StackMob-v2.0.0/Headers/AFNetworking/AFURLConnectionOperation.h
	StackMob-v2.0.0/Headers/AFNetworking/AFXMLRequestOperation.h
	StackMob-v2.0.0/Headers/AFNetworking/UIImageView+AFNetworking.h
	StackMob-v2.0.0/Headers/Base64EncodedStringFromData.h
	StackMob-v2.0.0/Headers/Common.h
	StackMob-v2.0.0/Headers/FileManagement.h
	StackMob-v2.0.0/Headers/KeychainWrapper.h
	StackMob-v2.0.0/Headers/NSArray+Enumerable.h
	StackMob-v2.0.0/Headers/NSDictionary+AtomicCounter.h
	StackMob-v2.0.0/Headers/NSEntityDescription+StackMobSerialization.h
	StackMob-v2.0.0/Headers/NSManagedObject+StackMobSerialization.h
	StackMob-v2.0.0/Headers/NSManagedObjectContext+Concurrency.h
	StackMob-v2.0.0/Headers/SMBinaryDataConversion.h
	StackMob-v2.0.0/Headers/SMClient.h
	StackMob-v2.0.0/Headers/SMCoreDataStore.h
	StackMob-v2.0.0/Headers/SMCustomCodeRequest.h
	StackMob-v2.0.0/Headers/SMDataStore+Protected.h
	StackMob-v2.0.0/Headers/SMDataStore.h
	StackMob-v2.0.0/Headers/SMError.h
	StackMob-v2.0.0/Headers/SMGeoPoint.h
	StackMob-v2.0.0/Headers/SMIncrementalStore+Query.h
	StackMob-v2.0.0/Headers/SMIncrementalStore.h
	StackMob-v2.0.0/Headers/SMIncrementalStoreNode.h
	StackMob-v2.0.0/Headers/SMJSONRequestOperation.h
	StackMob-v2.0.0/Headers/SMLocationManager.h
	StackMob-v2.0.0/Headers/SMNetworkReachability.h
	StackMob-v2.0.0/Headers/SMOAuth1Client.h
	StackMob-v2.0.0/Headers/SMOAuth2Client.h
	StackMob-v2.0.0/Headers/SMPredicate.h
	StackMob-v2.0.0/Headers/SMPushClient.h
	StackMob-v2.0.0/Headers/SMPushToken.h
	StackMob-v2.0.0/Headers/SMQuery.h
	StackMob-v2.0.0/Headers/SMRequestOptions.h
	StackMob-v2.0.0/Headers/SMResponseBlocks.h
	StackMob-v2.0.0/Headers/SMSyncedObject.h
	StackMob-v2.0.0/Headers/SMUserManagedObject.h
	StackMob-v2.0.0/Headers/SMUserSession.h
	StackMob-v2.0.0/Headers/SMVersion.h
	StackMob-v2.0.0/Headers/StackMob.h
	StackMob-v2.0.0/Headers/StackMobPush.h
	StackMob-v2.0.0/Headers/Synchronization.h
	StackMob-v2.0.0/Headers/SystemInformation.h
	StackMob-v2.0.0/libstackmob-v2.0.0.a
merged

v1