Merge with 3.7

git-svn-id: svn://svn.forge.objectweb.org/svnroot/spagobi/V_4.x/Server/trunk@20070 99afaf0d-6903-0410-885a-c66a8bbb5f81
Merge with 3.7

git-svn-id: svn://svn.forge.objectweb.org/svnroot/spagobi/V_4.x/Server/trunk@20071 99afaf0d-6903-0410-885a-c66a8bbb5f81


git-svn-id: svn://svn.forge.objectweb.org/svnroot/spagobi/V_4.x/Server/trunk@20072 99afaf0d-6903-0410-885a-c66a8bbb5f81
Merge with 3.7

git-svn-id: svn://svn.forge.objectweb.org/svnroot/spagobi/V_4.x/Server/trunk@20073 99afaf0d-6903-0410-885a-c66a8bbb5f81
Merge with 3.7

git-svn-id: svn://svn.forge.objectweb.org/svnroot/spagobi/V_4.x/Server/trunk@20074 99afaf0d-6903-0410-885a-c66a8bbb5f81
Merge with 3.7

git-svn-id: svn://svn.forge.objectweb.org/svnroot/spagobi/V_4.x/Server/trunk@20075 99afaf0d-6903-0410-885a-c66a8bbb5f81
Merge with 3.7

git-svn-id: svn://svn.forge.objectweb.org/svnroot/spagobi/V_4.x/Server/trunk@20076 99afaf0d-6903-0410-885a-c66a8bbb5f81
Merge with 3.7

git-svn-id: svn://svn.forge.objectweb.org/svnroot/spagobi/V_4.x/Server/trunk@20077 99afaf0d-6903-0410-885a-c66a8bbb5f81
Merge with 3.7

git-svn-id: svn://svn.forge.objectweb.org/svnroot/spagobi/V_4.x/Server/trunk@20078 99afaf0d-6903-0410-885a-c66a8bbb5f81
Added Temporary workaround because fieldsColumns is now an object with a new structure after changing DataSetJSONSerializer


git-svn-id: svn://svn.forge.objectweb.org/svnroot/spagobi/V_4.x/Server/trunk@20079 99afaf0d-6903-0410-885a-c66a8bbb5f81
Merge with 3.7

git-svn-id: svn://svn.forge.objectweb.org/svnroot/spagobi/V_4.x/Server/trunk@20080 99afaf0d-6903-0410-885a-c66a8bbb5f81


git-svn-id: svn://svn.forge.objectweb.org/svnroot/spagobi/V_4.x/Server/trunk@20081 99afaf0d-6903-0410-885a-c66a8bbb5f81