Merged HEAD (5.2) to 5.2.N (5.2.1)

126369 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      119798 jvonka: FileFolder API - NodeApiTest - add tests (+ve & -ve) to create empty file node
      - TODO subsequently show that file content can be updated
      RA-636


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126714 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

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

@@ -54,6 +54,12 @@ public class Folder extends Node
         this.isFolder = true;
     }
 
+    @Override
+    public ContentInfo getContent()
+    {
+        return null;
+    }
+
     @Override
     public String toString()
     {