no message
Merge commit '54ef82767a06f0b86f008038386c5f3f2c3d504f'

Conflicts:
	applications/Live_Agent_Console.app
	classes/Clone.cls
	classes/PR.cls
	communities/Internal Community.community
	dashboards/Folder04t100000008oVG/Dashboard04t100000008oVG.dashboard
	dashboards/SFDC_Success_Dashboard/CSM_SUCCESS_IMPROVEMENT_MARKETING_MANAGER.dashboard
	dashboards/SFDC_Success_Dashboard/CSM_Success_ADOPTION_LOGIN.dashboard
	dashboards/SFDC_Success_Dashboard/CSM_Success_IMPROVEMENT_ACTIVITY_MANAGER.dashboard
	dashboards/SFDC_Success_Dashboard/CSM_Success_JikoBunseki.dashboard
	dashboards/SFDC_Success_Dashboard/Comment_Ranking_DB.dashboard
	dashboards/SFDC_Success_Dashboard/Daily_management_Dashboard.dashboard
	dashboards/SFDC_Success_Dashboard/Feed_comment_dashboard.dashboard
	dashboards/SFDC_Success_Dashboard/SFDC_TOP_Check_Dashboard.dashboard
	dashboards/SFDC_Success_Dashboard/Success_IjouchiKakunin_SFDC.dashboard
	dashboards/SFDC_Success_Dashboard/csm_accountanalysis.dashboard
	layouts/Account-Account %28Marketing%29 Layout.layout
	layouts/Account-Account %28Sales%29 Layout.layout
	layouts/Account-Account %28Support%29 Layout.layout
	layouts/Account-Account Layout.layout
	layouts/Campaign-Campaign Layout.layout
	layouts/Case-Case %28Marketing%29 Layout.layout
	layouts/Case-Case %28Sales%29 Layout.layout
	layouts/Case-Case %28Support%29 Layout.layout
	layouts/Case-Case Layout.layout
	layouts/Contact-Contact %28Marketing%29 Layout.layout
	layouts/Contact-Contact %28Sales%29 Layout.layout
	layouts/Contact-Contact %28Support%29 Layout.layout
	layouts/Contact-Contact Layout.layout
	layouts/Contract-Contract Layout.layout
	layouts/Event-Event Layout.layout
	layouts/Idea-Idea Layout.layout
	layouts/Lead-Lead %28Marketing%29 Layout.layout
	layouts/Lead-Lead %28Sales%29 Layout.layout
	layouts/Lead-Lead %28Support%29 Layout.layout
	layouts/Lead-Lead Layout.layout
	layouts/LiveChatVisitor-Live Chat の訪問者のレイアウト.layout
	layouts/Opinion_Question__c-意識調査質問レイアウト.layout
	layouts/Opportunity-Opportunity %28Marketing%29 Layout.layout
	layouts/Opportunity-Opportunity %28Sales%29 Layout.layout
	layouts/Opportunity-Opportunity %28Support%29 Layout.layout
	layouts/Opportunity-Opportunity Layout.layout
	layouts/Task-Task Layout.layout
	objectTranslations/Opinion_Question__c-ja.objectTranslation
	objects/Account.object
	objects/Account__c.object
	objects/Activity.object
	objects/Asset.object
	objects/Automated_Test_Run__c.object
	objects/Campaign.object
	objects/CampaignMember.object
	objects/Case.object
	objects/Chat_Answer__kav.object
	objects/Contact.object
	objects/ContentVersion.object
	objects/Contract.object
	objects/CustomObject__c.object
	objects/CustomerTrend__c.object
	objects/Customer__c.object
	objects/Event.object
	objects/Idea.object
	objects/Invoice_Statement__c.object
	objects/Kadaikanri__c.object
	objects/Lead.object
	objects/Line_Item__c.object
	objects/LiveAgentSession.object
	objects/LiveChatTranscript.object
	objects/LiveChatTranscriptEvent.object
	objects/LiveChatVisitor.object
	objects/Log__c.object
	objects/Merchandise__c.object
	objects/Mining__c.object
	objects/OAuth2_Token__c.object
	objects/OAuthServiceAPIParameter__c.object
	objects/OAuthServiceAPI__c.object
	objects/OAuthServiceVariable__c.object
	objects/OAuthService__c.object
	objects/OAuth_Token__c.object
	objects/Opinion_Question_Answer__c.object
	objects/Opinion_Question_Response__c.object
	objects/Opinion_Question__c.object
	objects/Opinion_Respondent__c.object
	objects/Opinion__c.object
	objects/Opportunity.object
	objects/OpportunityCompetitor.object
	objects/OpportunityLineItem.object
	objects/PPAPICredential__c.object
	objects/PPCommonRequestParameters__c.object
	objects/Pricebook2.object
	objects/Product2.object
	objects/Question.object
	objects/QuickText.object
	objects/Reply.object
	objects/SFDC_Issue__c.object
	objects/SFDC_Project__c.object
	objects/Site_Event__c.object
	objects/Site_Metric_Date__c.object
	objects/Site_Metric_Settings__c.object
	objects/Site_Metric__c.object
	objects/SocialPersona.object
	objects/Solution.object
	objects/Task.object
	objects/Test_Runner_Job__c.object
	objects/Timecard__c.object
	objects/UniqueMail__c.object
	objects/User.object
	objects/WordList__c.object
	objects/forecast__c.object
	package.xml
	profiles/Admin.profile
	profiles/Authenticated Website Custom.profile
	profiles/Chatter External User.profile
	profiles/Chatter Free User.profile
	profiles/Chatter Moderator User.profile
	profiles/ContractManager.profile
	profiles/Custom%3A Marketing Profile.profile
	profiles/Custom%3A Sales Profile.profile
	profiles/Custom%3A Support Profile.profile
	profiles/Customer Community Login User.profile
	profiles/Customer Community User.profile
	profiles/Customer Portal Manager Custom.profile
	profiles/Customer Portal Manager Standard.profile
	profiles/Demo Member プロファイル.profile
	profiles/Demo プロファイル.profile
	profiles/Force%2Ecom - Free User.profile
	profiles/Gold Partner User.profile
	profiles/Guest.profile
	profiles/HighVolumePortal.profile
	profiles/Hoge プロファイル.profile
	profiles/Live Agent ユーザ.profile
	profiles/MarketingProfile.profile
	profiles/Partner Community Login User.profile
	profiles/Partner Community User.profile
	profiles/PlatformPortal.profile
	profiles/ReadOnly.profile
	profiles/Seminar プロファイル.profile
	profiles/Silver Partner User.profile
	profiles/SolutionManager.profile
	profiles/Standard.profile
	profiles/StandardAul.profile
	profiles/カスタム Platform ユーザ.profile
	profiles/サポート.profile
	profiles/システム管理者%EF%BC%88カスタム%EF%BC%89.profile
	reportTypes/CustomReportType1.reportType
	settings/ChatterAnswers.settings
	settings/Entitlement.settings
	settings/Ideas.settings
	translations/en_US.translation
	translations/ja.translation