takehiro
Merge branch 'master' of https://github.com/fakechan/lifeclock

Conflicts:
	DreamRunner/DreamRunner.xcodeproj/project.pbxproj

DreamRunner/DreamRunner.xcodeproj/project.xcworkspace/xcshareddata/Dream
Runner.xccheckout
	DreamRunner/DreamRunner/AppDelegate.m
	DreamRunner/DreamRunner/DreamRunner-Info.plist
	DreamRunner/DreamRunner/MapViewController.m

DreamRunner/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBAccessT
okenData.h

DreamRunner/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBAppCall
.h

DreamRunner/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBAppEven
ts.h

DreamRunner/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBAppLink
Data.h

DreamRunner/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBCacheDe
scriptor.h

DreamRunner/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBConnect
.h

DreamRunner/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBDialog.
h

DreamRunner/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBDialogs
.h

DreamRunner/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBDialogs
Data.h

DreamRunner/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBDialogs
Params.h

DreamRunner/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBError.h

DreamRunner/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBErrorUt
ility.h

DreamRunner/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBFrictio
nlessRecipientCache.h

DreamRunner/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBFrictio
nlessRequestSettings.h

DreamRunner/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBFriendP
ickerViewController.h

DreamRunner/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBGraphLo
cation.h

DreamRunner/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBGraphOb
ject.h

DreamRunner/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBGraphPl
ace.h

DreamRunner/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBGraphUs
er.h

DreamRunner/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBInsight
s.h

DreamRunner/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBLoginDi
alog.h

DreamRunner/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBLoginVi
ew.h

DreamRunner/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBNativeD
ialogs.h

DreamRunner/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBOpenGra
phAction.h

DreamRunner/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBOpenGra
phActionShareDialogParams.h

DreamRunner/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBOpenGra
phObject.h

DreamRunner/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBPlacePi
ckerViewController.h

DreamRunner/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBProfile
PictureView.h

DreamRunner/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBRequest
.h

DreamRunner/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBRequest
Connection.h

DreamRunner/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBSession
.h

DreamRunner/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBSession
ManualTokenCachingStrategy.h

DreamRunner/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBSession
TokenCachingStrategy.h

DreamRunner/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBSetting
s.h

DreamRunner/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBShareDi
alogParams.h

DreamRunner/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBTestSes
sion.h

DreamRunner/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBUserSet
tingsViewController.h

DreamRunner/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBViewCon
troller.h

DreamRunner/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBWebDial
ogs.h

DreamRunner/FacebookSDK.framework/Versions/A/DeprecatedHeaders/Facebook.
h

DreamRunner/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FacebookS
DK.h

DreamRunner/FacebookSDK.framework/Versions/A/DeprecatedHeaders/NSError+F
BError.h
	DreamRunner/FacebookSDK.framework/Versions/A/FacebookSDK

DreamRunner/FacebookSDK.framework/Versions/A/Headers/FBAccessTokenData.h
	DreamRunner/FacebookSDK.framework/Versions/A/Headers/FBAppCall.h
	DreamRunner/FacebookSDK.framework/Versions/A/Headers/FBAppEvents.h
	DreamRunner/FacebookSDK.framework/Versions/A/Headers/FBAppLinkData.h

DreamRunner/FacebookSDK.framework/Versions/A/Headers/FBCacheDescriptor.h
	DreamRunner/FacebookSDK.framework/Versions/A/Headers/FBDialogs.h
	DreamRunner/FacebookSDK.framework/Versions/A/Headers/FBDialogsData.h
	DreamRunner/FacebookSDK.framework/Versions/A/Headers/FBDialogsParams.h
	DreamRunner/FacebookSDK.framework/Versions/A/Headers/FBError.h
	DreamRunner/FacebookSDK.framework/Versions/A/Headers/FBErrorUtility.h

DreamRunner/FacebookSDK.framework/Versions/A/Headers/FBFrictionlessRecip
ientCache.h

DreamRunner/FacebookSDK.framework/Versions/A/Headers/FBFriendPickerViewC
ontroller.h
	DreamRunner/FacebookSDK.framework/Versions/A/Headers/FBGraphLocation.h
	DreamRunner/FacebookSDK.framework/Versions/A/Headers/FBGraphObject.h
	DreamRunner/FacebookSDK.framework/Versions/A/Headers/FBGraphPlace.h
	DreamRunner/FacebookSDK.framework/Versions/A/Headers/FBGraphUser.h
	DreamRunner/FacebookSDK.framework/Versions/A/Headers/FBInsights.h
	DreamRunner/FacebookSDK.framework/Versions/A/Headers/FBLoginView.h
	DreamRunner/FacebookSDK.framework/Versions/A/Headers/FBNativeDialogs.h

DreamRunner/FacebookSDK.framework/Versions/A/Headers/FBOpenGraphAction.h

DreamRunner/FacebookSDK.framework/Versions/A/Headers/FBOpenGraphActionSh
areDialogParams.h

DreamRunner/FacebookSDK.framework/Versions/A/Headers/FBOpenGraphObject.h

DreamRunner/FacebookSDK.framework/Versions/A/Headers/FBPlacePickerViewCo
ntroller.h

DreamRunner/FacebookSDK.framework/Versions/A/Headers/FBProfilePictureVie
w.h
	DreamRunner/FacebookSDK.framework/Versions/A/Headers/FBRequest.h

DreamRunner/FacebookSDK.framework/Versions/A/Headers/FBRequestConnection
.h
	DreamRunner/FacebookSDK.framework/Versions/A/Headers/FBSession.h

DreamRunner/FacebookSDK.framework/Versions/A/Headers/FBSessionTokenCachi
ngStrategy.h
	DreamRunner/FacebookSDK.framework/Versions/A/Headers/FBSettings.h

DreamRunner/FacebookSDK.framework/Versions/A/Headers/FBShareDialogParams
.h
	DreamRunner/FacebookSDK.framework/Versions/A/Headers/FBTestSession.h

DreamRunner/FacebookSDK.framework/Versions/A/Headers/FBUserSettingsViewC
ontroller.h
	DreamRunner/FacebookSDK.framework/Versions/A/Headers/FBViewController.h
	DreamRunner/FacebookSDK.framework/Versions/A/Headers/FBWebDialogs.h
	DreamRunner/FacebookSDK.framework/Versions/A/Headers/FacebookSDK.h
	DreamRunner/FacebookSDK.framework/Versions/A/Headers/NSError+FBError.h

DreamRunner/FacebookSDK.framework/Versions/A/Resources/FBUserSettingsVie
wResources.bundle/Contents/Resources/en.lproj/Localizable.strings

DreamRunner/FacebookSDK.framework/Versions/A/Resources/FBUserSettingsVie
wResources.bundle/Contents/Resources/he.lproj/Localizable.strings

DreamRunner/FacebookSDK.framework/Versions/A/Resources/FBUserSettingsVie
wResources.bundle/images/facebook-logo.png

DreamRunner/FacebookSDK.framework/Versions/A/Resources/FBUserSettingsVie
wResources.bundle/images/facebook-logo@2x.png

DreamRunner/FacebookSDK.framework/Versions/A/Resources/FBUserSettingsVie
wResources.bundle/images/loginBackgroundIPadLandscape.jpg

DreamRunner/FacebookSDK.framework/Versions/A/Resources/FBUserSettingsVie
wResources.bundle/images/loginBackgroundIPadLandscape@2x.jpg

DreamRunner/FacebookSDK.framework/Versions/A/Resources/FBUserSettingsVie
wResources.bundle/images/loginBackgroundIPadPortrait.jpg

DreamRunner/FacebookSDK.framework/Versions/A/Resources/FBUserSettingsVie
wResources.bundle/images/loginBackgroundIPadPortrait@2x.jpg

DreamRunner/FacebookSDK.framework/Versions/A/Resources/FBUserSettingsVie
wResources.bundle/images/loginBackgroundIPhonePortrait.jpg

DreamRunner/FacebookSDK.framework/Versions/A/Resources/FBUserSettingsVie
wResources.bundle/images/loginBackgroundIPhonePortrait@2x.jpg

DreamRunner/FacebookSDK.framework/Versions/A/Resources/FBUserSettingsVie
wResources.bundle/images/silver-button-normal.png

DreamRunner/FacebookSDK.framework/Versions/A/Resources/FBUserSettingsVie
wResources.bundle/images/silver-button-normal@2x.png

DreamRunner/FacebookSDK.framework/Versions/A/Resources/FBUserSettingsVie
wResources.bundle/images/silver-button-pressed.png

DreamRunner/FacebookSDK.framework/Versions/A/Resources/FBUserSettingsVie
wResources.bundle/images/silver-button-pressed@2x.png

DreamRunner/FacebookSDK.framework/Versions/A/Resources/FacebookSDKResour
ces.bundle.README
	DreamRunner/FacebookSDK.framework/Versions/A/Resources/Info.plist
	DreamRunner/libon/AppDelegate.h
	DreamRunner/libon/Base.lproj/Main_iPhone.storyboard
	DreamRunner/libon/ReserveViewController.h
	DreamRunner/libon/ReserveViewController.m