update conflicted files

git-svn-id: https://plugins.svn.wordpress.org/sp-client-document-manager/trunk@847861 b8457f37-d9ea-0310-8a92-e5e31aec5664