added click on map annotation to open poi; added query for checkins at each POI's checkin
before merge
merged with master; upgraded parse framework, ios 4.5
Merge branch 'master' of github.com:sachmaan/NightPulse into merged

Conflicts:
	.DS_Store
	NightPulse.xcodeproj/project.pbxproj
	NightPulse/en.lproj/MainWindow.xib
	Parse.framework/.DS_Store
	Parse.framework/Versions/0.4.21/Headers/PFConstants.h
	Parse.framework/Versions/0.4.21/Headers/PFGeoPoint.h
	Parse.framework/Versions/0.4.21/Headers/PFQuery.h
	Parse.framework/Versions/0.4.21/Headers/PFQueryTableViewController.h
	Parse.framework/Versions/0.4.21/Headers/PF_EGORefreshTableHeaderView.h
	Parse.framework/Versions/0.4.21/Headers/PF_FBConnect.h
	Parse.framework/Versions/0.4.21/Headers/PF_FBDialog.h
	Parse.framework/Versions/0.4.21/Headers/PF_FBLoginDialog.h
	Parse.framework/Versions/0.4.21/Headers/PF_MBProgressHUD.h
	Parse.framework/Versions/0.4.21/Headers/Parse.h
	Parse.framework/Versions/0.4.21/Resources/Info.plist
	Parse.framework/Versions/1.1.14/Headers/PFConstants.h
	Parse.framework/Versions/1.1.14/Headers/PFGeoPoint.h
	Parse.framework/Versions/1.1.14/Headers/PFQuery.h
	Parse.framework/Versions/1.1.14/Headers/PFQueryTableViewController.h
	Parse.framework/Versions/1.1.14/Headers/PF_EGORefreshTableHeaderView.h
	Parse.framework/Versions/1.1.14/Headers/PF_FBConnect.h
	Parse.framework/Versions/1.1.14/Headers/PF_FBDialog.h
	Parse.framework/Versions/1.1.14/Headers/PF_FBLoginDialog.h
	Parse.framework/Versions/1.1.14/Headers/PF_MBProgressHUD.h
	Parse.framework/Versions/1.1.14/Headers/Parse.h
	Parse.framework/Versions/1.1.14/Resources/Info.plist
	Parse.framework/Versions/1.1.8/Headers/PFConstants.h
	Parse.framework/Versions/1.1.8/Headers/PFGeoPoint.h
	Parse.framework/Versions/1.1.8/Headers/PFQuery.h
	Parse.framework/Versions/1.1.8/Headers/PFQueryTableViewController.h
	Parse.framework/Versions/1.1.8/Headers/PF_EGORefreshTableHeaderView.h
	Parse.framework/Versions/1.1.8/Headers/PF_FBConnect.h
	Parse.framework/Versions/1.1.8/Headers/PF_FBDialog.h
	Parse.framework/Versions/1.1.8/Headers/PF_FBLoginDialog.h
	Parse.framework/Versions/1.1.8/Headers/PF_MBProgressHUD.h
	Parse.framework/Versions/1.1.8/Headers/Parse.h
	Parse.framework/Versions/1.1.8/Resources/Info.plist
removed
merged and updated Parse framework, added ParseHelperLibrary files
removed .DS_Store
updated Parse
Merge branch 'POIView' of github.com:sachmaan/NightPulse into merged

Conflicts:
	.DS_Store
	NightPulse.xcodeproj/project.pbxproj
	NightPulse/.DS_Store
	NightPulse/en.lproj/MainWindow.xib
	Parse.framework/Versions/0.4.21/Headers/PF_FBConnect.h
	Parse.framework/Versions/1.1.14/Headers/PFConstants.h
	Parse.framework/Versions/1.1.14/Headers/PFGeoPoint.h
	Parse.framework/Versions/1.1.14/Headers/PFQuery.h
	Parse.framework/Versions/1.1.14/Headers/PFQueryTableViewController.h
	Parse.framework/Versions/1.1.14/Headers/PF_EGORefreshTableHeaderView.h
	Parse.framework/Versions/1.1.14/Headers/PF_FBConnect.h
	Parse.framework/Versions/1.1.14/Headers/PF_FBDialog.h
	Parse.framework/Versions/1.1.14/Headers/PF_FBLoginDialog.h
	Parse.framework/Versions/1.1.14/Headers/PF_FBViewController+Internal.h
	Parse.framework/Versions/1.1.14/Headers/PF_MBProgressHUD.h
	Parse.framework/Versions/1.1.14/Headers/Parse.h
	Parse.framework/Versions/1.1.14/Resources/Info.plist
updated Parse
uses old xcode project
readded feedview to merged file
merging Merge branch 'merged' of github.com:sachmaan/NightPulse

Conflicts:
	.DS_Store
	NightPulse.xcodeproj/project.pbxproj
	Parse.framework/Versions/1.1.14/Headers/PFACL.h
	Parse.framework/Versions/1.1.14/Headers/PFAnonymousUtils.h
	Parse.framework/Versions/1.1.14/Headers/PFCloud.h
	Parse.framework/Versions/1.1.14/Headers/PFConstants.h
	Parse.framework/Versions/1.1.14/Headers/PFFacebookUtils.h
	Parse.framework/Versions/1.1.14/Headers/PFFile.h
	Parse.framework/Versions/1.1.14/Headers/PFGeoPoint.h
	Parse.framework/Versions/1.1.14/Headers/PFImageView.h
	Parse.framework/Versions/1.1.14/Headers/PFInstallation.h
	Parse.framework/Versions/1.1.14/Headers/PFLogInView.h
	Parse.framework/Versions/1.1.14/Headers/PFLogInViewController.h
	Parse.framework/Versions/1.1.14/Headers/PFObject.h
	Parse.framework/Versions/1.1.14/Headers/PFProduct.h
	Parse.framework/Versions/1.1.14/Headers/PFProductTableViewController.h
	Parse.framework/Versions/1.1.14/Headers/PFPurchase.h
	Parse.framework/Versions/1.1.14/Headers/PFPurchaseTableViewCell.h
	Parse.framework/Versions/1.1.14/Headers/PFPush.h
	Parse.framework/Versions/1.1.14/Headers/PFQuery.h
	Parse.framework/Versions/1.1.14/Headers/PFQueryTableViewController.h
	Parse.framework/Versions/1.1.14/Headers/PFRelation.h
	Parse.framework/Versions/1.1.14/Headers/PFRole.h
	Parse.framework/Versions/1.1.14/Headers/PFSignUpView.h
	Parse.framework/Versions/1.1.14/Headers/PFSignUpViewController.h
	Parse.framework/Versions/1.1.14/Headers/PFTableViewCell.h
	Parse.framework/Versions/1.1.14/Headers/PFTwitterUtils.h
	Parse.framework/Versions/1.1.14/Headers/PFUser.h
	Parse.framework/Versions/1.1.14/Headers/PF_EGORefreshTableHeaderView.h
	Parse.framework/Versions/1.1.14/Headers/PF_FBCacheDescriptor.h
	Parse.framework/Versions/1.1.14/Headers/PF_FBCacheIndex.h
	Parse.framework/Versions/1.1.14/Headers/PF_FBConnect.h
	Parse.framework/Versions/1.1.14/Headers/PF_FBContentLink.h
	Parse.framework/Versions/1.1.14/Headers/PF_FBDataDiskCache.h
	Parse.framework/Versions/1.1.14/Headers/PF_FBDialog.h
	Parse.framework/Versions/1.1.14/Headers/PF_FBError.h
	Parse.framework/Versions/1.1.14/Headers/PF_FBFrictionlessRequestSettings.h
	Parse.framework/Versions/1.1.14/Headers/PF_FBFriendPickerCacheDescriptor.h
	Parse.framework/Versions/1.1.14/Headers/PF_FBFriendPickerViewController+Internal.h
	Parse.framework/Versions/1.1.14/Headers/PF_FBFriendPickerViewController.h
	Parse.framework/Versions/1.1.14/Headers/PF_FBGraphLocation.h
	Parse.framework/Versions/1.1.14/Headers/PF_FBGraphObject.h
	Parse.framework/Versions/1.1.14/Headers/PF_FBGraphObjectPagingLoader.h
	Parse.framework/Versions/1.1.14/Headers/PF_FBGraphObjectTableCell.h
	Parse.framework/Versions/1.1.14/Headers/PF_FBGraphObjectTableDataSource.h
	Parse.framework/Versions/1.1.14/Headers/PF_FBGraphObjectTableSelection.h
	Parse.framework/Versions/1.1.14/Headers/PF_FBGraphPlace.h
	Parse.framework/Versions/1.1.14/Headers/PF_FBGraphUser.h
	Parse.framework/Versions/1.1.14/Headers/PF_FBLogger.h
	Parse.framework/Versions/1.1.14/Headers/PF_FBLoginDialog.h
	Parse.framework/Versions/1.1.14/Headers/PF_FBLoginView.h
	Parse.framework/Versions/1.1.14/Headers/PF_FBOpenGraphAction.h
	Parse.framework/Versions/1.1.14/Headers/PF_FBPlacePickerCacheDescriptor.h
	Parse.framework/Versions/1.1.14/Headers/PF_FBPlacePickerViewController+Internal.h
	Parse.framework/Versions/1.1.14/Headers/PF_FBPlacePickerViewController.h
	Parse.framework/Versions/1.1.14/Headers/PF_FBProfilePictureView.h
	Parse.framework/Versions/1.1.14/Headers/PF_FBRequest.h
	Parse.framework/Versions/1.1.14/Headers/PF_FBRequestBody.h
	Parse.framework/Versions/1.1.14/Headers/PF_FBRequestConnection+Internal.h
	Parse.framework/Versions/1.1.14/Headers/PF_FBRequestConnection.h
	Parse.framework/Versions/1.1.14/Headers/PF_FBSession+Internal.h
	Parse.framework/Versions/1.1.14/Headers/PF_FBSession+Protected.h
	Parse.framework/Versions/1.1.14/Headers/PF_FBSession.h
	Parse.framework/Versions/1.1.14/Headers/PF_FBSessionManualTokenCachingStrategy.h
	Parse.framework/Versions/1.1.14/Headers/PF_FBSessionTokenCachingStrategy.h
	Parse.framework/Versions/1.1.14/Headers/PF_FBSettings+Internal.h
	Parse.framework/Versions/1.1.14/Headers/PF_FBSettings.h
	Parse.framework/Versions/1.1.14/Headers/PF_FBTestSession+Internal.h
	Parse.framework/Versions/1.1.14/Headers/PF_FBTestSession.h
	Parse.framework/Versions/1.1.14/Headers/PF_FBURLConnection.h
	Parse.framework/Versions/1.1.14/Headers/PF_FBUserSettingsViewController.h
	Parse.framework/Versions/1.1.14/Headers/PF_FBUtility.h
	Parse.framework/Versions/1.1.14/Headers/PF_FBViewController+Internal.h
	Parse.framework/Versions/1.1.14/Headers/PF_FBViewController.h
	Parse.framework/Versions/1.1.14/Headers/PF_Facebook.h
	Parse.framework/Versions/1.1.14/Headers/PF_FacebookSDK.h
	Parse.framework/Versions/1.1.14/Headers/PF_MBProgressHUD.h
	Parse.framework/Versions/1.1.14/Headers/PF_Twitter.h
	Parse.framework/Versions/1.1.14/Headers/Parse.h
	Parse.framework/Versions/1.1.14/Parse
	Parse.framework/Versions/1.1.14/Resources/Info.plist
	Parse.framework/Versions/1.1.14/Resources/Localizable.strings
	Parse.framework/Versions/Current
fixed xcodeproj; fixed Parse