install feeds_filemaker to prepare the import from filemaker DB using feeds
 install imce, colorbox librairy, feeds_filemaker
 installed notequeue, style guide, schema, services
 changes on the themes
 fixing the conflict to merge with the master
modified the settings.php to merge with re,ote have to revdrt back chmod 777..
Merge branch 'master' of svn-3453.devcloud.hosting.acquia.com:hjf