update
updatMerge branch 'master' of https://github.com/jugo8633/InteractiveReader

Conflicts:
	BookshelfUser/.gitignore
	Common/.gitignore
	InteractiveView/.gitignore
	Reader/.gitignore
	Reader/assets/resource
	facebook-android-sdk-3.8.0/.gitignore
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/AccessToken.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/AppEventsLogger$AccessTokenAppIdPair.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/AppEventsLogger$AppEvent.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/AppEventsLogger$PersistedEvents.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/AppEventsLogger$SessionEventsState.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/AppEventsLogger.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/AppLinkData.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/AuthorizationClient$3.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/AuthorizationClient$4.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/AuthorizationClient$5.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/AuthorizationClient$KatanaAuthHandler.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/AuthorizationClient$KatanaLoginDialogAuthHandler.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/AuthorizationClient$KatanaProxyAuthHandler.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/AuthorizationClient$WebViewAuthHandler.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/AuthorizationClient.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/FacebookBroadcastReceiver.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/FacebookRequestError.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/LoggingBehavior.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/LoginActivity.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/NativeAppCallAttachmentStore$1.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/NativeAppCallAttachmentStore$2.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/NativeAppCallAttachmentStore.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/NativeAppCallContentProvider.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/ProgressOutputStream.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/Request$ParcelFileDescriptorWithMimeType.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/Request$Serializer.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/Request.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/RequestAsyncTask.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/RequestBatch.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/RequestProgress.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/Response.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/Session$2.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/Session$AutoPublishAsyncTask.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/Session$TokenRefreshRequest.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/Session.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/Settings.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/SharedPreferencesTokenCachingStrategy.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/TestSession.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/TokenCachingStrategy.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/UiLifecycleHelper$ActiveSessionBroadcastReceiver.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/UiLifecycleHelper.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/android/AsyncFacebookRunner$1.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/android/AsyncFacebookRunner$2.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/android/Facebook$TokenRefreshConnectionHandler.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/android/Facebook$TokenRefreshServiceConnection.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/android/Facebook.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/android/FbDialog.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/android/R$attr.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/android/R$color.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/android/R$dimen.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/android/R$drawable.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/android/R$id.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/android/R$layout.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/android/R$string.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/android/R$style.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/android/R$styleable.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/android/Util.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/internal/AttributionIdentifiers.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/internal/FileLruCache$1.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/internal/FileLruCache$BufferFile.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/internal/FileLruCache$CloseCallbackOutputStream.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/internal/FileLruCache$CopyingInputStream.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/internal/FileLruCache$ModifiedFile.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/internal/FileLruCache$StreamHeader.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/internal/FileLruCache.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/internal/ImageDownloader.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/internal/ImageResponseCache.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/internal/Logger.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/internal/NativeProtocol$NativeAppInfo.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/internal/NativeProtocol.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/internal/PlatformServiceClient.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/internal/ServerProtocol.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/internal/SessionTracker.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/internal/UrlRedirectCache.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/internal/Utility.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/internal/WorkQueue$1.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/internal/WorkQueue$WorkNode.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/internal/WorkQueue.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/model/GraphObject$Factory$GraphObjectListImpl.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/model/GraphObject$Factory$GraphObjectProxy.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/model/GraphObject$Factory.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/model/JsonUtil.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/widget/FacebookDialog$OpenGraphDialogBuilderBase.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/widget/FacebookDialog$PendingCall.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/widget/FacebookDialog.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/widget/FacebookFragment.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/widget/FriendPickerFragment$ImmediateLoadingStrategy.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/widget/GraphObjectAdapter.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/widget/GraphObjectPagingLoader.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/widget/LoginButton$LoginButtonCallback.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/widget/LoginButton$LoginClickListener.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/widget/LoginButton.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/widget/PickerFragment$MultiSelectionStrategy.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/widget/PickerFragment$SingleSelectionStrategy.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/widget/PickerFragment.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/widget/PlacePickerFragment$1.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/widget/PlacePickerFragment$3.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/widget/PlacePickerFragment.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/widget/ProfilePictureView.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/widget/UserSettingsFragment.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/widget/WebDialog$BuilderBase.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/widget/WebDialog$DialogWebViewClient.class
	facebook-android-sdk-3.8.0/facebook/bin/classes/com/facebook/widget/WebDialog.class
	facebook-android-sdk-3.8.0/facebook/bin/facebooksdk.jar
	google-play-services_lib/.gitignore