Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/com/loopj/android/http/SimpleMultipartEntity.java

Author: nadam

.classpath

@@ -5,5 +5,6 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

src/com/loopj/android/http/SimpleMultipartEntity.java

@@ -83,17 +83,22 @@ public SimpleMultipartEntity(AsyncHttpResponseHandler progressHandler) {
         this.progressHandler = progressHandler;
     }
 
-    public void addPart(final String key, final String value) {
+    public void addPart(final String key, final String value, final String contentType) {
         try {
             out.write(boundaryLine);
             out.write(createContentDisposition(key));
+            out.write(createContentType(contentType));
             out.write(CR_LF);
             out.write(value.getBytes());
             out.write(CR_LF);
         } catch (final IOException e) {
             // Can't happen on ByteArrayOutputStream
         }
     }
+    
+    public void addPart(final String key, final String value) {
+        addPart(key, value, "text/plain; charset=UTF-8");
+    }
 
     public void addPart(String key, File file) {
         addPart(key, file, null);