Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)

122013 jvonka: Nodes (FileFolder) API - add isContent (in addition to isFolder) to node info
   RA-828, RA-741


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126449 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/rest/api/model/Document.java

@@ -55,7 +55,8 @@ public class Document extends Node
             contentInfo = new ContentInfo(mimeType, mimeTypeName, cd.getSize(), cd.getEncoding());
         }
 
-        this.isFolder = false;
+        setIsFolder(false);
+        setIsContent(true);
     }
 
     @Override