Merge pull request #284 from owncloud/setup_app_name

Setup app name, optional settings, and availability of multiple accounts.

diff --cc AndroidManifest.xml
Simple merge

diff --cc src/com/owncloud/android/files/services/FileUploader.java
Simple merge

diff --cc src/com/owncloud/android/operations/SynchronizeFolderOperation.java
index f406547,0236a13..3295668
--- 1/src/com/owncloud/android/operations/SynchronizeFolderOperation.java
--- 2/src/com/owncloud/android/operations/SynchronizeFolderOperation.java
+++ b/src/com/owncloud/android/operations/SynchronizeFolderOperation.java
@@@ -28,9 -28,7 +28,8 @@@ import java.util.List
  import java.util.Map;
  import java.util.Vector;
  
- import org.apache.commons.httpclient.Header;
  import org.apache.http.HttpStatus;
 +import org.apache.jackrabbit.webdav.DavConstants;
  import org.apache.jackrabbit.webdav.MultiStatus;
  import org.apache.jackrabbit.webdav.client.methods.PropFindMethod;
  

diff --cc src/com/owncloud/android/ui/activity/FileDisplayActivity.java
Simple merge

diff --cc src/com/owncloud/android/ui/fragment/FileDetailFragment.java
Simple merge

diff --cc src/com/owncloud/android/ui/preview/PreviewImageActivity.java
Simple merge