Merge branch 'master' into PHRAS-2581_twig-macro-explode_4.1

2025-10-23 18:03:17 +00:00 · 2019-06-03 11:54:54 +02:00
parent ff25eb226c 2c4ad4565c
commit aa584c97e8
76 changed files with 18119 additions and 3520 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -61,7 +61,9 @@ jobs:
        - run: node -v
        - run: npm -v
        - run: npm install -g yarn
-        - run: /opt/circleci/nodejs/v10.12.0/bin/yarn install
+        - run: rm ~/.yarn/bin/yarn
+        - run: ln -s /opt/circleci/nodejs/v10.12.0/bin/yarn ~/.yarn/bin/yarn
+        - run: yarn install
        - run: if [[ ! -e elasticsearch-2.3.3 ]]; then wget --no-check-certificate https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-2.3.3.tar.gz && tar -xvf elasticsearch-2.3.3.tar.gz && elasticsearch-2.3.3/bin/plugin install analysis-icu; fi
        - run:
            command: elasticsearch-2.3.3/bin/elasticsearch
--- a/.gitignore
+++ b/.gitignore
@@ -21,7 +21,7 @@
 !/config/configuration.sample.yml

 # Exclude generated proxies from doctrine2
-/resources/proxies
+#/resources/proxies

 # Exclude temporaries resources (zip files, quarantine documents etc ..) folder
 /tmp
--- a/16
+++ b/16
@@ -1,5 +1,4 @@
-FROM php:7.1-fpm-stretch as builder
-
+FROM php:7.0-fpm-stretch as builder

 RUN apt-get update \
    && apt-get install -y \
@@ -93,7 +92,7 @@ COPY templates /var/alchemy/templates
 COPY tests /var/alchemy/tests

 # Phraseanet
-FROM php:7.1-fpm-stretch as phraseanet
+FROM php:7.0-fpm-stretch as phraseanet
 RUN apt-get update \
    && apt-get install -y \
        apt-transport-https \
@@ -135,8 +134,13 @@ RUN apt-get update \
    && rm -rf /var/lib/apt/lists/* \
    && mkdir -p /var/log/supervisor

+RUN mkdir /entrypoint /var/alchemy \
+    && useradd -u 1000 app \
+    && mkdir -p /home/app/.composer \
+    && chown -R app: /home/app /var/alchemy

-COPY --from=builder /var/alchemy /var/alchemy/Phraseanet
+COPY --from=builder --chown=app /var/alchemy /var/alchemy/Phraseanet
+ADD ./docker/phraseanet/ /
 RUN mkdir -p /var/alchemy/Phraseanet/logs \
    && chmod -R 777 /var/alchemy/Phraseanet/logs \
    && mkdir -p /var/alchemy/Phraseanet/cache \
@@ -150,11 +154,11 @@ RUN mkdir -p /var/alchemy/Phraseanet/logs \
    && mkdir -p /var/alchemy/Phraseanet/config \
    && chmod -R 777 /var/alchemy/Phraseanet/config
 WORKDIR /var/alchemy/Phraseanet
-CMD ["php-fpm"]
+CMD ["/boot.sh"]

 # phraseanet-nginx
 FROM nginx:1.15 as phraseanet-nginx
 RUN useradd -u 1000 app
 ADD ./docker/nginx/ /
 COPY --from=builder /var/alchemy/www /var/alchemy/Phraseanet/www
-
+CMD ["/boot.sh"]
--- a/README.md
+++ b/README.md
@@ -56,9 +56,9 @@ The docker distribution come with 2 differents containers :
 The two images can be built respectively with these two commands :

    # nginx server
-    docker build --target phraseanet-nginx -t phraseanet-nginx .
+    docker build --target phraseanet-nginx -t local/phraseanet-nginx .

    # php-fpm application
-    docker build --target phraseanet -t phraseanet .
+    docker build --target phraseanet -t local/phraseanet .


--- a/composer.json
+++ b/composer.json
@@ -47,7 +47,7 @@
    "php": ">=5.5.9",
    "ext-intl": "*",
    "alchemy-fr/tcpdf-clone": "~6.0",
-    "alchemy/embed-bundle": "^2.0.2",
+    "alchemy/embed-bundle": "^2.0.3",
    "alchemy/geonames-api-consumer": "~0.1.0",
    "alchemy/mediavorus": "^0.4.4",
    "alchemy/oauth2php": "1.1.0",
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "f7b0fedd863f0f1aa5841665b563305d",
+    "content-hash": "de1d9335418b121d0ede26765b0a9e7d",
    "packages": [
        {
            "name": "alchemy-fr/tcpdf-clone",
@@ -131,16 +131,16 @@
        },
        {
            "name": "alchemy/embed-bundle",
-            "version": "2.0.1",
+            "version": "2.0.3",
            "source": {
                "type": "git",
                "url": "https://github.com/alchemy-fr/embed-bundle.git",
-                "reference": "36c788a38bfed3ed19fdc4e1cc0290f0a674e4b9"
+                "reference": "e02e25a04911210eaedff0adb9cf7589010c473b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/alchemy-fr/embed-bundle/zipball/36c788a38bfed3ed19fdc4e1cc0290f0a674e4b9",
-                "reference": "36c788a38bfed3ed19fdc4e1cc0290f0a674e4b9",
+                "url": "https://api.github.com/repos/alchemy-fr/embed-bundle/zipball/e02e25a04911210eaedff0adb9cf7589010c473b",
+                "reference": "e02e25a04911210eaedff0adb9cf7589010c473b",
                "shasum": ""
            },
            "require-dev": {
@@ -178,10 +178,10 @@
            ],
            "description": "Embed resources bundle",
            "support": {
-                "source": "https://github.com/alchemy-fr/embed-bundle/tree/2.0.1",
+                "source": "https://github.com/alchemy-fr/embed-bundle/tree/2.0.3",
                "issues": "https://github.com/alchemy-fr/embed-bundle/issues"
            },
-            "time": "2019-05-14T12:25:18+00:00"
+            "time": "2019-05-23T15:23:14+00:00"
        },
        {
            "name": "alchemy/geonames-api-consumer",
--- a/docker/nginx/boot.sh
+++ b/docker/nginx/boot.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+cat /nginx.conf.sample
+cat nginx.conf.sample | sed "s/\$MAX_BODY_SIZE/$MAX_BODY_SIZE/g" > /etc/nginx/nginx.conf
+cat /etc/nginx/nginx.conf
+nginx -g "daemon off;"
--- a/docker/nginx/etc/nginx/nginx.conf
+++ b/docker/nginx/etc/nginx/nginx.conf
@@ -60,6 +60,7 @@ http {
        location / {
            # First attempt to serve request as file, then
            # as directory, then fall back to index.html
+            client_max_body_size $MAX_BODY_SIZE;
            try_files $uri $uri/ @rewriteapp;
        }

--- a/docker/phraseanet/boot.sh
+++ b/docker/phraseanet/boot.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+envsubst < /php.ini.sample > /usr/local/etc/php/php.ini
+envsubst < /php-fpm.conf.sample > /usr/local/etc/php-fpm.conf
+php-fpm
--- a/docker/phraseanet/php-fpm.conf.sample
+++ b/docker/phraseanet/php-fpm.conf.sample
@@ -0,0 +1,125 @@
+;;;;;;;;;;;;;;;;;;;;;
+; FPM Configuration ;
+;;;;;;;;;;;;;;;;;;;;;
+
+; All relative paths in this configuration file are relative to PHP's install
+; prefix (/usr/local). This prefix can be dynamically changed by using the
+; '-p' argument from the command line.
+
+;;;;;;;;;;;;;;;;;;
+; Global Options ;
+;;;;;;;;;;;;;;;;;;
+
+[global]
+; Pid file
+; Note: the default prefix is /usr/local/var
+; Default Value: none
+;pid = run/php-fpm.pid
+
+; Error log file
+; If it's set to "syslog", log is sent to syslogd instead of being written
+; in a local file.
+; Note: the default prefix is /usr/local/var
+; Default Value: log/php-fpm.log
+error_log = /var/lib/phraseanet/logs/php-fpm.log
+
+; syslog_facility is used to specify what type of program is logging the
+; message. This lets syslogd specify that messages from different facilities
+; will be handled differently.
+; See syslog(3) for possible values (ex daemon equiv LOG_DAEMON)
+; Default Value: daemon
+;syslog.facility = daemon
+
+; syslog_ident is prepended to every message. If you have multiple FPM
+; instances running on the same server, you can change the default value
+; which must suit common needs.
+; Default Value: php-fpm
+;syslog.ident = php-fpm
+
+; Log level
+; Possible Values: alert, error, warning, notice, debug
+; Default Value: notice
+log_level = $PHP_LOG_LEVEL
+
+; If this number of child processes exit with SIGSEGV or SIGBUS within the time
+; interval set by emergency_restart_interval then FPM will restart. A value
+; of '0' means 'Off'.
+; Default Value: 0
+;emergency_restart_threshold = 0
+
+; Interval of time used by emergency_restart_interval to determine when
+; a graceful restart will be initiated.  This can be useful to work around
+; accidental corruptions in an accelerator's shared memory.
+; Available Units: s(econds), m(inutes), h(ours), or d(ays)
+; Default Unit: seconds
+; Default Value: 0
+;emergency_restart_interval = 0
+
+; Time limit for child processes to wait for a reaction on signals from master.
+; Available units: s(econds), m(inutes), h(ours), or d(ays)
+; Default Unit: seconds
+; Default Value: 0
+;process_control_timeout = 0
+
+; The maximum number of processes FPM will fork. This has been design to control
+; the global number of processes when using dynamic PM within a lot of pools.
+; Use it with caution.
+; Note: A value of 0 indicates no limit
+; Default Value: 0
+; process.max = 128
+
+; Specify the nice(2) priority to apply to the master process (only if set)
+; The value can vary from -19 (highest priority) to 20 (lower priority)
+; Note: - It will only work if the FPM master process is launched as root
+;       - The pool process will inherit the master process priority
+;         unless it specified otherwise
+; Default Value: no set
+; process.priority = -19
+
+; Send FPM to background. Set to 'no' to keep FPM in foreground for debugging.
+; Default Value: yes
+;daemonize = yes
+
+; Set open file descriptor rlimit for the master process.
+; Default Value: system defined value
+;rlimit_files = 1024
+
+; Set max core size rlimit for the master process.
+; Possible Values: 'unlimited' or an integer greater or equal to 0
+; Default Value: system defined value
+;rlimit_core = 0
+
+; Specify the event mechanism FPM will use. The following is available:
+; - select     (any POSIX os)
+; - poll       (any POSIX os)
+; - epoll      (linux >= 2.5.44)
+; - kqueue     (FreeBSD >= 4.1, OpenBSD >= 2.9, NetBSD >= 2.0)
+; - /dev/poll  (Solaris >= 7)
+; - port       (Solaris >= 10)
+; Default Value: not set (auto detection)
+;events.mechanism = epoll
+
+; When FPM is build with systemd integration, specify the interval,
+; in second, between health report notification to systemd.
+; Set to 0 to disable.
+; Available Units: s(econds), m(inutes), h(ours)
+; Default Unit: seconds
+; Default value: 10
+;systemd_interval = 10
+
+;;;;;;;;;;;;;;;;;;;;
+; Pool Definitions ;
+;;;;;;;;;;;;;;;;;;;;
+
+; Multiple pools of child processes may be started with different listening
+; ports and different management options.  The name of the pool will be
+; used in logs and stats. There is no limitation on the number of pools which
+; FPM can handle. Your system will tell you anyway :)
+
+; Include one or more files. If glob(3) exists, it is used to include a bunch of
+; files from a glob(3) pattern. This directive can be used everywhere in the
+; file.
+; Relative path can also be used. They will be prefixed by:
+;  - the global prefix if it's been set (-p argument)
+;  - /usr/local otherwise
+include=etc/php-fpm.d/*.conf
--- a/docker/phraseanet/usr/local/etc/php/php.ini
+++ b/docker/phraseanet/usr/local/etc/php/php.ini
@@ -669,7 +669,7 @@ auto_globals_jit = On
 ; Its value may be 0 to disable the limit. It is ignored if POST data reading
 ; is disabled through enable_post_data_reading.
 ; http://php.net/post-max-size
-post_max_size = 8M
+post_max_size = $MAX_BODY_SIZE

 ; Automatically add files before PHP document.
 ; http://php.net/auto-prepend-file
@@ -821,7 +821,7 @@ file_uploads = On

 ; Maximum allowed size for uploaded files.
 ; http://php.net/upload-max-filesize
-upload_max_filesize = 2M
+upload_max_filesize = $MAX_BODY_SIZE

 ; Maximum number of files that can be uploaded via a single request
 max_file_uploads = 20
@@ -1428,7 +1428,7 @@ session.referer_check =
 ; Set to {nocache,private,public,} to determine HTTP caching aspects
 ; or leave this empty to avoid sending anti-caching headers.
 ; http://php.net/session.cache-limiter
-session.cache_limiter = off
+session.cache_limiter = $SESSION_CACHE_LIMITER

 ; Document expires after n minutes.
 ; http://php.net/session.cache-expire
@@ -1744,10 +1744,10 @@ ldap.max_links = -1

 [opcache]
 ; Determines if Zend OPCache is enabled
-;opcache.enable=1
+opcache.enable=$OPCACHE_ENABLED

 ; Determines if Zend OPCache is enabled for the CLI version of PHP
-;opcache.enable_cli=0
+;opcache.enable_cli=$OPCACHE_ENABLED

 ; The OPcache shared memory storage size.
 ;opcache.memory_consumption=128
--- a/lib/Alchemy/Phrasea/Controller/Prod/LazaretController.php
+++ b/lib/Alchemy/Phrasea/Controller/Prod/LazaretController.php
@@ -38,7 +38,7 @@ class LazaretController extends Controller
     *
     * @param Request     $request The current request
     *
-     * @return Response
+     * @return String
     */
    public function listElement(Request $request)
    {
--- a/lib/Alchemy/Phrasea/TaskManager/Notifier.php
+++ b/lib/Alchemy/Phrasea/TaskManager/Notifier.php
@@ -25,7 +25,7 @@ class Notifier implements NotifierInterface
    private $logger;

    /** @var integer  */
-    private $timeout = 1;
+    private $timeout = 10;

    public function __construct(\ZMQSocket $socket, LoggerInterface $logger)
    {
--- a/lib/conf.d/configuration.yml
+++ b/lib/conf.d/configuration.yml
@@ -1,12 +1,15 @@
 servername: 'http://local.phrasea/'
 languages:
-    available: []
+    available:
+        - fr
+        - en
+        - de
+        - nl
    default: 'fr'
 main:
    maintenance: false
    key: ''
    api_require_ssl: true
-    delete-account-require-email-confirmation: true
    database:
        host: 'sql-host'
        port: 3306
@@ -24,10 +27,33 @@ main:
        options: {}
    search-engine:
        type: elasticsearch
-        # type: phrasea
        options:
-            host: localhost
+            host: 'localhost'
            port: 9200
+            index: ''
+            shards: 3
+            replicas: 0
+            minScore: 2
+            highlight: true
+            maxResultWindow: 500000
+            populate_order: RECORD_ID
+            populate_direction: DESC
+            activeTab: '#elastic-search'
+            base_aggregate_limit: 10
+            collection_aggregate_limit: 10
+            doctype_aggregate_limit: 0
+            camera_model_aggregate_limit: 0
+            iso_aggregate_limit: 0
+            aperture_aggregate_limit: 0   
+            shutterspeed_aggregate_limit: 0
+            flashfired_aggregate_limit: 0
+            framerate_aggregate_limit: 0
+            audiosamplerate_aggregate_limit: 0
+            videocodec_aggregate_limit: 0
+            audiocodec_aggregate_limit: 0
+            orientation_aggregate_limit: 0
+            colorspace_aggregate_limit: 0
+            mimetype_aggregate_limit: 0
    task-manager:
        status: started
        enabled: true
@@ -68,26 +94,20 @@ main:
        download: null
        lazaret: null
        caption: null
-    bridge:
-        youtube:
-            enabled: false
-            client_id: null
-            client_secret: null
-            developer_key: null
-        flickr:
-            enabled: false
-            client_id: null
-            client_secret: null
-        dailymotion:
-            enabled: false
-            client_id: null
-            client_secret: null
+
 trusted-proxies: []
 debugger:
    allowed-ips: []
 border-manager:
    enabled: true
-    extension-mapping: { }
+    extension-mapping:
+        otc: application/vnd.oasis.opendocument.chart-template
+        ttc: application/x-font-ttf
+        xlsx: application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
+        docx: application/msword
+        pptx: application/vnd.ms-powerpoint
+        mxf: application/mxf
+        mp4: video/mp4
    checkers:
        -
            type: Checker\Sha256
@@ -121,6 +141,9 @@ border-manager:
            enabled: false
            options:
                mediatypes: [Audio, Document, Flash, Image, Video]
+user_account:
+    deleting_policies:
+        email_confirmation: true
 authentication:
    auto-create:
        templates: {  }
@@ -202,8 +225,9 @@ embed_bundle:
    video:
        player: videojs
        autoplay: false
-        coverSubdef: thumbnail
-        available-speeds:
+        cover_subdef: thumbnail
+        message_start: StartOfMessage
+        available_speeds:
            - 1
            - 1.5
            - 3
@@ -211,37 +235,60 @@ embed_bundle:
        player: videojs
        autoplay: false
    document:
-        player: flexpaper
-        enable-pdfjs: true
+        #player: flexpaper
+        enable_pdfjs: true
 geocoding-providers:
    -
-        name: 'mapBox'
+        map-provider: 'mapboxWebGL'
        enabled: true
        public-key: ''
+        map-layers:
+            -
+                name: Light
+                value: 'mapbox://styles/mapbox/light-v9'
+            -
+                name: Streets
+                value: 'mapbox://styles/mapbox/streets-v9'
+            -
+                name: Basic
+                value: 'mapbox://styles/mapbox/basic-v9'
+            -
+                name: Satellite
+                value: 'mapbox://styles/mapbox/satellite-v9'
+            -
+                name: Dark
+                value: 'mapbox://styles/mapbox/dark-v9'
+        transition-mapboxgl:
+            -
+                animate: true
+                speed: '2.2'
+                curve: '1.42'
        default-position:
            - 2.335062
            - 48.879162
        default-zoom: 2
        marker-default-zoom: 11
-        position-fields:
-            -
-                name: GpsCompositePosition
-                type: latlng
+        position-fields: []
+            #-
+            #   name: GpsCompositePosition
+            #   type: latlng
            # -
            #    name: Longitude
            #    type: lng
            # -
            #    name: Latitude
            #    type: lat
+        geonames-field-mapping: true
+        cityfields: 'City, Ville'
+        provincefields: Province
+        countryfields: 'Country, Pays'
 video-editor:
    vttFieldName: VideoTextTrackChapters
-    seekBackwardStep: 1000 # in ms
-    seekForwardStep: 1000  # in ms
+    seekBackwardStep: 500 # in ms
+    seekForwardStep: 500  # in ms
    playbackRates:
        - 1
        - '1.5'
        - 3
+Console_logger_enabled_environments: [test]

-user_account:
-    deleting_policies:
-        email_confirmation: true
--- a/lib/conf.d/data_templates/DublinCore.xml
+++ b/lib/conf.d/data_templates/DublinCore.xml
@@ -182,26 +182,26 @@
    </subdefs>

    <description>
-        <Title src="XMP-dc:Title" thumbtitle="1" report="1" />
-        <Creator src="XMP-dc:Creator" report="1" />
-        <Subject src="XMP-dc:Subject" multi="1"/>
-        <Description src="XMP-dc:Description" report="0" />
+        <Title src="XMP-dc:Title" type="string" thumbtitle="1" report="1" />
+        <Creator src="XMP-dc:Creator" type="string" report="1" />
+        <Subject src="XMP-dc:Subject" type="string" multi="1"/>
+        <Description src="XMP-dc:Description" type="string" report="0" />
        <Publisher src="XMP-dc:Publisher" type="date" report="0" />
-        <Contributor src="XMP-dc:Contributor" report="0"/>
+        <Contributor src="XMP-dc:Contributor" type="string" report="0"/>
        <Date src="XMP-dc:Date" type="date" report="0" />
-        <Type src="XMP-dc:Type" report="1" />
-        <Format src="XMP-dc:Format" report="0" />
-        <Identifier src="XMP-dc:Identifier" report="1" />
-        <Source src="XMP-dc:Source" report="0" />
-        <Language src="XMP-dc:Language" report="0" />
-        <Relation src="XMP-dc:Relation" report="0" />
-        <Coverage src="XMP-dc:Coverage" report="1" />
-        <Rights src="XMP-dc:Rights" report="0" />
-        <Comments src="" business="1" report="0" />
+        <Type src="XMP-dc:Type" type="string" report="1" />
+        <Format src="XMP-dc:Format" type="string" report="0" />
+        <Identifier src="XMP-dc:Identifier" type="string" report="1" />
+        <Source src="XMP-dc:Source" type="string" report="0" />
+        <Language src="XMP-dc:Language" type="string" report="0" />
+        <Relation src="XMP-dc:Relation" type="string" report="0" />
+        <Coverage src="XMP-dc:Coverage" type="string" report="1" />
+        <Rights src="XMP-dc:Rights" type="string" report="0" />
+        <Comments src="" business="1" type="string" report="0" />
        <Filename src="Phraseanet:tf-basename" readonly="1" type="string" report="1"/>
-        <CameraDevice src="IFD0:Model" readonly="1" report="0" />
-        <Latitude src="GPS:GPSLatitude" readonly="1" report="0" />
-        <Longitude src="GPS:GPSLongitude" readonly="1" report="0"/>
+        <CameraDevice src="IFD0:Model" type="string" readonly="1" report="0" />
+        <Latitude src="GPS:GPSLatitude" type="number" readonly="1" report="0" />
+        <Longitude src="GPS:GPSLongitude"  type="number" readonly="1" report="0"/>
        <ArchiveDate src="Phraseanet:tf-archivedate" readonly="1" type="date" report="0" />
        <LastEditDate src="Phraseanet:tf-editdate" readonly="1" type="date" report="0" />
    </description>
--- a/lib/conf.d/data_templates/en-simple.xml
+++ b/lib/conf.d/data_templates/en-simple.xml
@@ -182,27 +182,27 @@
    </subdefs>

    <description>
-        <Object src="IPTC:ObjectName" />
-        <Category src="IPTC:Category"/>
-        <SupplCategory src="IPTC:SupplementalCategories" multi="1"/>
-        <Keywords src="IPTC:Keywords" multi="1"/>
-        <SpecialInstruct src="IPTC:SpecialInstructions"/>
+        <Object src="IPTC:ObjectName" type="string"/>
+        <Category src="IPTC:Category" type="string"/>
+        <SupplCategory src="IPTC:SupplementalCategories" type="string" multi="1"/>
+        <Keywords src="IPTC:Keywords" type="string" multi="1"/>
+        <SpecialInstruct src="IPTC:SpecialInstructions" type="string"/>
        <Date src="IPTC:DateCreated" type="date" />
-        <Byline src="IPTC:By-line"/>
-        <BylineTitle src="IPTC:By-lineTitle"/>
-        <City src="IPTC:City" />
-        <Province src="IPTC:Province-State" />
-        <Country src="IPTC:Country-PrimaryLocationName" />
-        <OriginalRef src="IPTC:OriginalTransmissionReference" />
-        <Headline src="IPTC:Headline" report="1" thumbtitle="1" />
-        <Credit src="IPTC:Credit" report="1" />
-        <Source src="IPTC:Source" />
-        <Caption src="IPTC:Caption-Abstract" />
-        <CaptionWriter src="IPTC:Writer-Editor" />
-        <Longitude src="GPS:GPSLongitude" readonly="1"/>
-        <Latitude src="GPS:GPSLatitude" readonly="1"/>
-        <CameraModel src="IFD0:Model" readonly="1"/>
-        <FileName src="Phraseanet:tf-basename" readonly="1" type="string" />
+        <Byline src="IPTC:By-line" type="string"/>
+        <BylineTitle src="IPTC:By-lineTitle" type="string"/>
+        <City src="IPTC:City" type="string"/>
+        <Province src="IPTC:Province-State" type="string"/>
+        <Country src="IPTC:Country-PrimaryLocationName" type="string"/>
+        <OriginalRef src="IPTC:OriginalTransmissionReference" type="string"/>
+        <Headline src="IPTC:Headline" type="string" report="1" thumbtitle="1"/>
+        <Credit src="IPTC:Credit" type="string" report="1"/>
+        <Source src="IPTC:Source" type="string"/>
+        <Caption src="IPTC:Caption-Abstract" type="string"/>
+        <CaptionWriter src="IPTC:Writer-Editor" type="string"/>
+        <Longitude src="GPS:GPSLongitude" type="number" readonly="1"/>
+        <Latitude src="GPS:GPSLatitude" type="number" readonly="1"/>
+        <CameraModel src="IFD0:Model" type="string" readonly="1"/>
+        <FileName src="Phraseanet:tf-basename" type="string" readonly="1"/>
    </description>

    <statbits>
--- a/lib/conf.d/data_templates/fr-simple.xml
+++ b/lib/conf.d/data_templates/fr-simple.xml
@@ -182,27 +182,27 @@
    </subdefs>

    <description>
-        <Objet src="IPTC:ObjectName" />
-        <Categorie src="IPTC:Category"/>
-        <AutresCategories src="IPTC:SupplementalCategories" multi="1"/>
-        <MotsCles src="IPTC:Keywords" multi="1"/>
-        <Observations src="IPTC:SpecialInstructions"/>
+        <Objet src="IPTC:ObjectName" type="string"/>
+        <Categorie src="IPTC:Category" type="string"/>
+        <AutresCategories src="IPTC:SupplementalCategories" type="string" multi="1"/>
+        <MotsCles src="IPTC:Keywords" type="string" multi="1"/>
+        <Observations src="IPTC:SpecialInstructions" type="string"/>
        <Date src="IPTC:DateCreated" type="date"/>
-        <Signature src="IPTC:By-line"/>
-        <TitreCredits src="IPTC:By-lineTitle"/>
-        <Ville src="IPTC:City" />
-        <Province src="IPTC:Province-State" />
-        <Pays src="IPTC:Country-PrimaryLocationName" />
-        <ReferencesOriginales src="IPTC:OriginalTransmissionReference" />
-        <Titre src="IPTC:Headline" report="1" thumbtitle="1" />
-        <Credit src="IPTC:Credit" report="1" />
-        <Source src="IPTC:Source" />
-        <Legende src="IPTC:Caption-Abstract" />
-        <Redacteur src="IPTC:Writer-Editor" />
-        <Longitude src="GPS:GPSLongitude" readonly="1"/>
-        <Latitude src="GPS:GPSLatitude" readonly="1"/>
-        <AppareilPhoto src="IFD0:Model" readonly="1"/>
-        <NomDeFichier src="Phraseanet:tf-basename" readonly="1" type="string" />
+        <Signature src="IPTC:By-line" type="string"/>
+        <TitreCredits src="IPTC:By-lineTitle" type="string"/>
+        <Ville src="IPTC:City" type="string" />
+        <Province src="IPTC:Province-State" type="string"/>
+        <Pays src="IPTC:Country-PrimaryLocationName" type="string"/>
+        <ReferencesOriginales src="IPTC:OriginalTransmissionReference" type="string"/>
+        <Titre src="IPTC:Headline" type="string" report="1" thumbtitle="1" />
+        <Credit src="IPTC:Credit" type="string" report="1" />
+        <Source src="IPTC:Source" type="string"/>
+        <Legende src="IPTC:Caption-Abstract" type="string"/>
+        <Redacteur src="IPTC:Writer-Editor" type="string"/>
+        <Longitude src="GPS:GPSLongitude" type="number" readonly="1"/>
+        <Latitude src="GPS:GPSLatitude" type="number" readonly="1"/>
+        <AppareilPhoto src="IFD0:Model" type="string" readonly="1"/>
+        <NomDeFichier src="Phraseanet:tf-basename" type="string" readonly="1"/>
    </description>

    <statbits>
--- a/package.json
+++ b/package.json
@@ -65,7 +65,7 @@
    "normalize-css": "^2.1.0",
    "npm": "^6.0.0",
    "npm-modernizr": "^2.8.3",
-    "phraseanet-production-client": "0.34.11",
+    "phraseanet-production-client": "^0.34.15-d",
    "requirejs": "^2.3.5",
    "tinymce": "^4.0.28",
    "underscore": "^1.8.3",
--- a/resources/locales/messages.de.xlf
+++ b/resources/locales/messages.de.xlf
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='utf-8'?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
  <file date="2019-05-21T05:53:02Z" source-language="en" target-language="de" datatype="plaintext" original="not.available">
    <header>
@@ -7,8 +7,8 @@
    </header>
    <body>
      <trans-unit id="da39a3ee5e6b4b0d3255bfef95601890afd80709" resname="">
-        <source></source>
-        <target state="new"></target>
+        <source/>
+        <target state="new"/>
        <jms:reference-file line="60">Form/Login/PhraseaAuthenticationForm.php</jms:reference-file>
        <jms:reference-file line="47">Form/Configuration/EmailFormType.php</jms:reference-file>
      </trans-unit>
@@ -26,75 +26,75 @@
        <target state="translated">Parameter "Authentifizierung erzwingen" erzwingt den Push Empfänger, ein Phraseanet Konto zu haben, um den Inhalt anzuschauen. Es vermeidet, unautorisierte Benutzer dem Push Inhalt zuzugreifen, falls sie die URL bekämen (Email wurde weitergeleitet, zum Beispiel).</target>
        <jms:reference-file line="175">prod/templates/push.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="17b36ba11b9598e1ca72638a17637c71db031f8b" resname="#3567c6">
+      <trans-unit id="17b36ba11b9598e1ca72638a17637c71db031f8b" resname="#3567c6" approved="yes">
        <source>#3567c6</source>
-        <target state="new">#3567c6</target>
+        <target state="translated">#3567c6</target>
        <jms:reference-file line="81">Form/Configuration/CustomLinkFormType.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="c18097cf04c5f24e6b201e44603c26f000cbf266" resname="#4497d5">
+      <trans-unit id="c18097cf04c5f24e6b201e44603c26f000cbf266" resname="#4497d5" approved="yes">
        <source>#4497d5</source>
-        <target state="new">#4497d5</target>
+        <target state="translated">#4497d5</target>
        <jms:reference-file line="80">Form/Configuration/CustomLinkFormType.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="654b7f2144322b13150ca53f8eb712644275fbbb" resname="#5aa53b">
+      <trans-unit id="654b7f2144322b13150ca53f8eb712644275fbbb" resname="#5aa53b" approved="yes">
        <source>#5aa53b</source>
-        <target state="new">#5aa53b</target>
+        <target state="translated">#5aa53b</target>
        <jms:reference-file line="78">Form/Configuration/CustomLinkFormType.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="81184afa6b2fb59a54a368a94c5af314882f4379" resname="#a1d0d0">
+      <trans-unit id="81184afa6b2fb59a54a368a94c5af314882f4379" resname="#a1d0d0" approved="yes">
        <source>#a1d0d0</source>
-        <target state="new">#a1d0d0</target>
+        <target state="translated">#a1d0d0</target>
        <jms:reference-file line="79">Form/Configuration/CustomLinkFormType.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="69760e828adabd5e543638f8b396d108e4e1c7f6" resname="#ad0800">
+      <trans-unit id="69760e828adabd5e543638f8b396d108e4e1c7f6" resname="#ad0800" approved="yes">
        <source>#ad0800</source>
-        <target state="new">#ad0800</target>
+        <target state="translated">#ad0800</target>
        <jms:reference-file line="71">Form/Configuration/CustomLinkFormType.php</jms:reference-file>
        <jms:reference-file line="72">Form/Configuration/CustomLinkFormType.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="8868030f047d29838dccd3ebd90a8cbcf5cf97b9" resname="#b151ee">
+      <trans-unit id="8868030f047d29838dccd3ebd90a8cbcf5cf97b9" resname="#b151ee" approved="yes">
        <source>#b151ee</source>
-        <target state="new">#b151ee</target>
+        <target state="translated">#b151ee</target>
        <jms:reference-file line="82">Form/Configuration/CustomLinkFormType.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="df800d7d3f6bec2f0c48d7b18ad0f7515b4ed8a4" resname="#b8d84e">
+      <trans-unit id="df800d7d3f6bec2f0c48d7b18ad0f7515b4ed8a4" resname="#b8d84e" approved="yes">
        <source>#b8d84e</source>
-        <target state="new">#b8d84e</target>
+        <target state="translated">#b8d84e</target>
        <jms:reference-file line="77">Form/Configuration/CustomLinkFormType.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="4d3505d50f73a3440832d861060fc212eb2d929a" resname="#c875ea">
+      <trans-unit id="4d3505d50f73a3440832d861060fc212eb2d929a" resname="#c875ea" approved="yes">
        <source>#c875ea</source>
-        <target state="new">#c875ea</target>
+        <target state="translated">#c875ea</target>
        <jms:reference-file line="83">Form/Configuration/CustomLinkFormType.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="cdd9fb48ed6b38bdf4cd732d30851062312f64b3" resname="#e46990">
+      <trans-unit id="cdd9fb48ed6b38bdf4cd732d30851062312f64b3" resname="#e46990" approved="yes">
        <source>#e46990</source>
-        <target state="new">#e46990</target>
+        <target state="translated">#e46990</target>
        <jms:reference-file line="84">Form/Configuration/CustomLinkFormType.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="22a0112b6eafc281d17f1b98fb8405847d01f04b" resname="#f06006">
+      <trans-unit id="22a0112b6eafc281d17f1b98fb8405847d01f04b" resname="#f06006" approved="yes">
        <source>#f06006</source>
-        <target state="new">#f06006</target>
+        <target state="translated">#f06006</target>
        <jms:reference-file line="73">Form/Configuration/CustomLinkFormType.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="db6ca79114142b612eebf0ca5f80b94c80cbf453" resname="#f4ea5b">
+      <trans-unit id="db6ca79114142b612eebf0ca5f80b94c80cbf453" resname="#f4ea5b" approved="yes">
        <source>#f4ea5b</source>
-        <target state="new">#f4ea5b</target>
+        <target state="translated">#f4ea5b</target>
        <jms:reference-file line="76">Form/Configuration/CustomLinkFormType.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="cc4fad5f043fc9875dcdc532a296ec359a6c39e1" resname="#f5842b">
+      <trans-unit id="cc4fad5f043fc9875dcdc532a296ec359a6c39e1" resname="#f5842b" approved="yes">
        <source>#f5842b</source>
-        <target state="new">#f5842b</target>
+        <target state="translated">#f5842b</target>
        <jms:reference-file line="74">Form/Configuration/CustomLinkFormType.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="590b78bf59d578b0efdd1a7b1a385e8004fa88e8" resname="#ffc322">
+      <trans-unit id="590b78bf59d578b0efdd1a7b1a385e8004fa88e8" resname="#ffc322" approved="yes">
        <source>#ffc322</source>
-        <target state="new">#ffc322</target>
+        <target state="translated">#ffc322</target>
        <jms:reference-file line="75">Form/Configuration/CustomLinkFormType.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="0cc996e2ae03790c84ef6edc0601ba0245d7cf1c" resname="#ffccd7">
+      <trans-unit id="0cc996e2ae03790c84ef6edc0601ba0245d7cf1c" resname="#ffccd7" approved="yes">
        <source>#ffccd7</source>
-        <target state="new">#ffccd7</target>
+        <target state="translated">#ffccd7</target>
        <jms:reference-file line="85">Form/Configuration/CustomLinkFormType.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="a9378053eb7743587671aa830ffd2c9f1b13ad1a" resname="%ElementsCount% records" approved="yes">
@@ -526,9 +526,9 @@
        <target state="translated">API Webhook</target>
        <jms:reference-file line="58">TaskManager/Job/WebhookJob.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="62a3ad0fef668c4e2a220f6982de94942fbf1d1e" resname="AR">
+      <trans-unit id="62a3ad0fef668c4e2a220f6982de94942fbf1d1e" resname="AR" approved="yes">
        <source>AR</source>
-        <target state="new">AR</target>
+        <target state="translated">AR</target>
        <jms:reference-file line="39">Form/Configuration/CustomLinkFormType.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="8887b473975b3b740e5afe559123403a6c219524" resname="About Roles :" approved="yes">
@@ -1267,9 +1267,9 @@
        <jms:reference-file line="37">Media/Subdef/Audio.php</jms:reference-file>
        <jms:reference-file line="36">Media/Subdef/Video.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="a80232c45008d73666e95544f7c9c8c0896536af" resname="Audio Samplerate">
+      <trans-unit id="a80232c45008d73666e95544f7c9c8c0896536af" resname="Audio Samplerate" approved="yes">
        <source>Audio Samplerate</source>
-        <target state="new">Audio Samplerate</target>
+        <target state="translated">Audio Samplerate</target>
        <jms:reference-file line="339">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="31afcc88a7f552bfd4d330c2c70d8fafd7b8e0f9" resname="Audio channel" approved="yes">
@@ -1841,9 +1841,9 @@
        <target state="translated">Farbraum</target>
        <jms:reference-file line="62">web/common/technical_datas.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="0b8cb446bc8277d5fd8242aa11ecb0054f9bbaa6" resname="Colorspace">
+      <trans-unit id="0b8cb446bc8277d5fd8242aa11ecb0054f9bbaa6" resname="Colorspace" approved="yes">
        <source>Colorspace</source>
-        <target state="new">Colorspace</target>
+        <target state="translated">Colorspace</target>
        <jms:reference-file line="367">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="478443411674f0df06db3b28230d37625383f8c2" resname="Commande" approved="yes">
@@ -2150,14 +2150,14 @@
        <target state="translated">DCES</target>
        <jms:reference-file line="121">admin/fields/templates.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="ce3e4bed2954adbf05f8edfaf1a4c0cc0cea70e9" resname="DE">
+      <trans-unit id="ce3e4bed2954adbf05f8edfaf1a4c0cc0cea70e9" resname="DE" approved="yes">
        <source>DE</source>
-        <target state="new">DE</target>
+        <target state="translated">DE</target>
        <jms:reference-file line="40">Form/Configuration/CustomLinkFormType.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="129bcdb9bbdbd9bba49b7e1eb1ec49698604f0b0" resname="DU">
+      <trans-unit id="129bcdb9bbdbd9bba49b7e1eb1ec49698604f0b0" resname="DU" approved="yes">
        <source>DU</source>
-        <target state="new">DU</target>
+        <target state="translated">DU</target>
        <jms:reference-file line="41">Form/Configuration/CustomLinkFormType.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="5e2dc4518235e7567a3d68c45cb6165ec116fa3c" resname="Danger zone !">
@@ -2464,9 +2464,9 @@
        <jms:reference-file line="71">web/report/report_layout_child.html.twig</jms:reference-file>
        <jms:reference-file line="48">web/report/form_date_and_base.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="fd281ce85e6f98a7dad0aa31a2e493a85ef178ca" resname="Design of personalization logo section">
+      <trans-unit id="fd281ce85e6f98a7dad0aa31a2e493a85ef178ca" resname="Design of personalization logo section" approved="yes">
        <source>Design of personalization logo section</source>
-        <target state="new">Design of personalization logo section</target>
+        <target state="translated">Logo Anpassung</target>
        <jms:reference-file line="60">Form/Configuration/GeneralFormType.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="ac930a136ebd04a19bc5f2ce1769fc065efb7bdf" resname="Detailed view URL" approved="yes">
@@ -2653,9 +2653,9 @@
        <target state="new">E-mail domain</target>
        <jms:reference-file line="167">actions/Feedback/list.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="734a78cd06d0929c433f487754d18bf073e43bf6" resname="EN">
+      <trans-unit id="734a78cd06d0929c433f487754d18bf073e43bf6" resname="EN" approved="yes">
        <source>EN</source>
-        <target state="new">EN</target>
+        <target state="translated">EN</target>
        <jms:reference-file line="37">Form/Configuration/CustomLinkFormType.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="a908567d2c0292366061394efd6d40b139e033c5" resname="ERREUR : La classe de subdef est necessaire et egal a &quot;thumbnail&quot;,&quot;preview&quot; ou &quot;document&quot;" approved="yes">
@@ -2673,9 +2673,9 @@
        <target state="translated">FEHLER : Alle "subdefgroup" tags brauchen ein "name" Attribut</target>
        <jms:reference-file line="213">lib/classes/databox.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="9debabbaa01a190fabe8324c5e6e2f2808052099" resname="ES">
+      <trans-unit id="9debabbaa01a190fabe8324c5e6e2f2808052099" resname="ES" approved="yes">
        <source>ES</source>
-        <target state="new">ES</target>
+        <target state="translated">ES</target>
        <jms:reference-file line="38">Form/Configuration/CustomLinkFormType.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="5301648dcf6b53cefc9ed52999aaa92d4603cae0" resname="Edit" approved="yes">
@@ -2795,22 +2795,22 @@
        <target state="translated">E-Mail Test Ergebnis: %email_status%</target>
        <jms:reference-file line="136">web/admin/dashboard.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="c839b2905a9c9e4e611519e461c6f3e0dde4ec78" resname="Email:deletion:request:message Hello %civility% %firstName% %lastName%.&#10;            We have received an account deletion request for your account on %urlInstance%, please confirm this deletion by clicking on the link below.&#10;            If you are not at the origin of this request, please change your password as soon as possible %resetPassword%&#10;            Link is valid for one hour.">
+      <trans-unit id="c839b2905a9c9e4e611519e461c6f3e0dde4ec78" resname="Email:deletion:request:message Hello %civility% %firstName% %lastName%.&#10;            We have received an account deletion request for your account on %urlInstance%, please confirm this deletion by clicking on the link below.&#10;            If you are not at the origin of this request, please change your password as soon as possible %resetPassword%&#10;            Link is valid for one hour." approved="yes">
        <source>Email:deletion:request:message Hello %civility% %firstName% %lastName%.
            We have received an account deletion request for your account on %urlInstance%, please confirm this deletion by clicking on the link below.
            If you are not at the origin of this request, please change your password as soon as possible %resetPassword%
            Link is valid for one hour.</source>
-        <target state="needs-translation">Hallo % civility %% firstName %% lastName%. Wir haben eine Löschungsanfrage für Ihr Konto bei% urlInstance% erhalten. Bitte bestätigen Sie diesen Löschvorgang, indem Sie auf den untenstehenden Link klicken. Wenn Sie sich nicht am Ursprung dieser Anfrage befinden, ändern Sie Ihr Passwort so bald wie möglich.% ResetPassword% Link ist eine Stunde lang gültig.</target>
+        <target state="translated">Hallo % civility %% firstName %% lastName%. Wir haben eine Löschungsanfrage für Ihr Konto bei% urlInstance% erhalten. Bitte bestätigen Sie diesen Löschvorgang, indem Sie auf den untenstehenden Link klicken. Wenn Sie sich nicht am Ursprung dieser Anfrage befinden, ändern Sie Ihr Passwort so bald wie möglich.% ResetPassword% Link ist eine Stunde lang gültig.</target>
        <jms:reference-file line="51">Notification/Mail/MailRequestAccountDelete.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="ccbd5b5d94afa34b04935d0b084335f2656d96af" resname="Email:deletion:request:subject Delete account confirmation">
+      <trans-unit id="ccbd5b5d94afa34b04935d0b084335f2656d96af" resname="Email:deletion:request:subject Delete account confirmation" approved="yes">
        <source>Email:deletion:request:subject Delete account confirmation</source>
-        <target state="needs-translation">Benutzerkonto Löschung Bestätigung</target>
+        <target state="translated">Benutzerkonto Löschung Bestätigung</target>
        <jms:reference-file line="39">Notification/Mail/MailRequestAccountDelete.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="b37c2cc6df6ff49078905d16da4e3fa3a28490e4" resname="Email:deletion:request:textButton Delete my account">
+      <trans-unit id="b37c2cc6df6ff49078905d16da4e3fa3a28490e4" resname="Email:deletion:request:textButton Delete my account" approved="yes">
        <source>Email:deletion:request:textButton Delete my account</source>
-        <target state="needs-translation">Mein Benutzerkonto löschen</target>
+        <target state="translated">Mein Benutzerkonto löschen</target>
        <jms:reference-file line="68">Notification/Mail/MailRequestAccountDelete.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="473558393914486d8e60b9968e5443e40be433e0" resname="Emails" approved="yes">
@@ -3173,9 +3173,9 @@
        <target state="translated">Export in der Warteschlange gespeichert</target>
        <jms:reference-file line="136">Controller/Prod/ExportController.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="6d2830b1e76dc7300fce6745176601827d233de8" resname="FR">
+      <trans-unit id="6d2830b1e76dc7300fce6745176601827d233de8" resname="FR" approved="yes">
        <source>FR</source>
-        <target state="new">FR</target>
+        <target state="translated">FR</target>
        <jms:reference-file line="36">Form/Configuration/CustomLinkFormType.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="acb28212fba0272ee990cebd571ebe09b463312e" resname="FTP" approved="yes">
@@ -3330,9 +3330,9 @@
        <jms:reference-file line="313">web/prod/index.html.twig</jms:reference-file>
        <jms:reference-file line="87">web/common/technical_datas.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="2869d115faa9aa305076269dfbaf57c28cbd9fb6" resname="FlashFired">
+      <trans-unit id="2869d115faa9aa305076269dfbaf57c28cbd9fb6" resname="FlashFired" approved="yes">
        <source>FlashFired</source>
-        <target state="new">FlashFired</target>
+        <target state="translated">FlashFired</target>
        <jms:reference-file line="318">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="02893456d53323f0fdbbe9447fe5b3401f2102f7" resname="Flatten layers" approved="yes">
@@ -3618,9 +3618,9 @@
        <target state="translated">IP</target>
        <jms:reference-file line="28">web/account/sessions.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="4f325d995b6d028ccc75771b1679537b623521c4" resname="ISO">
+      <trans-unit id="4f325d995b6d028ccc75771b1679537b623521c4" resname="ISO" approved="yes">
        <source>ISO</source>
-        <target state="new">ISO</target>
+        <target state="translated">ISO</target>
        <jms:reference-file line="288">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="16a5173a6d384d155354f429d72834cd0bd6bc54" resname="ISO sensibility" approved="yes">
@@ -3923,9 +3923,9 @@
        <jms:reference-file line="38">admin/statusbit/edit.html.twig</jms:reference-file>
        <jms:reference-file line="103">admin/statusbit/edit.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="89b86ab0e66f527166d98df92ddbcf5416ed58f6" resname="Language">
+      <trans-unit id="89b86ab0e66f527166d98df92ddbcf5416ed58f6" resname="Language" approved="yes">
        <source>Language</source>
-        <target state="new">Language</target>
+        <target state="translated">Sprache</target>
        <jms:reference-file line="674">web/prod/index.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="863cb39fbe7d70597076af1960b7ae4618d9e1bc" resname="Last Name" approved="yes">
@@ -4070,9 +4070,9 @@
        <target state="translated">Lichtwert</target>
        <jms:reference-file line="122">web/common/technical_datas.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="99f6a030c5134d53253c7442cb05c1be14229565" resname="Lightbox">
+      <trans-unit id="99f6a030c5134d53253c7442cb05c1be14229565" resname="Lightbox" approved="yes">
        <source>Lightbox</source>
-        <target state="new">Lightbox</target>
+        <target state="translated">Lightbox</target>
        <jms:reference-file line="152">prod/WorkZone/Macros.html.twig</jms:reference-file>
        <jms:reference-file line="153">prod/WorkZone/Macros.html.twig</jms:reference-file>
      </trans-unit>
@@ -4296,9 +4296,9 @@
        <target state="translated">Mime Typ</target>
        <jms:reference-file line="14">web/common/technical_datas.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="1bd7ccbde8d3077fec1f549017e747393223a900" resname="MimeType">
+      <trans-unit id="1bd7ccbde8d3077fec1f549017e747393223a900" resname="MimeType" approved="yes">
        <source>MimeType</source>
-        <target state="new">MimeType</target>
+        <target state="translated">MimeType</target>
        <jms:reference-file line="374">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="cb4f425374af2741715669ed8b541a666078b729" resname="Minimum number of letters before truncation" approved="yes">
@@ -4414,9 +4414,9 @@
        <target state="translated">mehrwertiges</target>
        <jms:reference-file line="158">admin/fields/templates.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="1b369c4651e2b82200334fa587669b3828071192" resname="My application ">
+      <trans-unit id="1b369c4651e2b82200334fa587669b3828071192" resname="My application " approved="yes">
        <source>My application </source>
-        <target state="needs-translation">Meine Anwendung</target>
+        <target state="translated">Meine Anwendung</target>
        <jms:reference-file line="266">web/account/account.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="9f36fd4dc42df8a92572afe51d887c5f33dda5b0" resname="My baskets" approved="yes">
@@ -4587,9 +4587,9 @@
        <jms:reference-file line="8">WorkZone/Browser/Results.html.twig</jms:reference-file>
        <jms:reference-file line="111">WorkZone/Browser/Results.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="bfccc7c966ca427d629149d67548af04605eb746" resname="No thesaurus concept query">
+      <trans-unit id="bfccc7c966ca427d629149d67548af04605eb746" resname="No thesaurus concept query" approved="yes">
        <source>No thesaurus concept query</source>
-        <target state="needs-translation">Keine Thesaurus Suche</target>
+        <target state="translated">Keine Thesaurus Suche</target>
        <jms:reference-file line="16">prod/results/infos.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="6866c8b666718aff85382e93b25ef50cd321669b" resname="No users selected" approved="yes">
@@ -4791,9 +4791,9 @@
        <target state="translated">Öffnen Sie die URL in einem neuen Fenster</target>
        <jms:reference-file line="125">Core/Provider/TwigServiceProvider.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="e72184f55cc026514b7160d78c3c5aef63c2a050" resname="Or">
+      <trans-unit id="e72184f55cc026514b7160d78c3c5aef63c2a050" resname="Or" approved="yes">
        <source>Or</source>
-        <target state="needs-translation">Oder</target>
+        <target state="translated">Oder</target>
        <jms:reference-file line="35">prod/upload/upload.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="94946e4d2391ccf8ff24f984869ae8fcf9ede7c4" resname="Or login with" approved="yes">
@@ -6003,9 +6003,9 @@
        <jms:reference-file line="56">admin/statusbit/edit.html.twig</jms:reference-file>
        <jms:reference-file line="121">admin/statusbit/edit.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="49fae2071d9672ce46d9fbadda409a3fa0cbc238" resname="Selected base(s)">
+      <trans-unit id="49fae2071d9672ce46d9fbadda409a3fa0cbc238" resname="Selected base(s)" approved="yes">
        <source>Selected base(s)</source>
-        <target state="needs-translation">Ausgewählte Datenbank(en) :</target>
+        <target state="translated">Ausgewählte Datenbank(en) :</target>
        <jms:reference-file line="335">web/prod/index.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="2c418c187fb3108749d7156765e7b9b16a51215f" resname="Selected files" approved="yes">
@@ -6036,9 +6036,9 @@
        <target state="translated">Auf Facebook teilen</target>
        <jms:reference-file line="32">prod/Share/record.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="60b2d62f2951ccf92ed7fb647ee7d6ab7ecfdd5e" resname="Send to Linkedin">
+      <trans-unit id="60b2d62f2951ccf92ed7fb647ee7d6ab7ecfdd5e" resname="Send to Linkedin" approved="yes">
        <source>Send to Linkedin</source>
-        <target state="new">Send to Linkedin</target>
+        <target state="translated">Auf LinkedIn teilen</target>
        <jms:reference-file line="37">prod/Share/record.html.twig</jms:reference-file>
        <jms:reference-file line="38">prod/Share/record.html.twig</jms:reference-file>
        <jms:reference-file line="39">prod/Share/record.html.twig</jms:reference-file>
@@ -6854,9 +6854,9 @@
        <target state="translated">Token</target>
        <jms:reference-file line="109">web/developers/application.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="e894979930445d4b2bd8c947d6e2e6b816fcb0ab" resname="Token not found">
+      <trans-unit id="e894979930445d4b2bd8c947d6e2e6b816fcb0ab" resname="Token not found" approved="yes">
        <source>Token not found</source>
-        <target state="needs-translation">Token nicht gefunden</target>
+        <target state="translated">Token nicht gefunden</target>
        <jms:reference-file line="383">Controller/Root/AccountController.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="f97edaa0ce78a61e01095cae4169cada477d52dc" resname="Tool box" approved="yes">
@@ -7636,9 +7636,9 @@
        <target state="translated">Meta schreiben</target>
        <jms:reference-file line="498">web/admin/subdefs.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="d3f8f7b810c4b08f0b4ac4e47fdf8d265a10d869" resname="YYYY-MM-DD">
+      <trans-unit id="d3f8f7b810c4b08f0b4ac4e47fdf8d265a10d869" resname="YYYY-MM-DD" approved="yes">
        <source>YYYY-MM-DD</source>
-        <target state="new">YYYY-MM-DD</target>
+        <target state="translated">JJJJ-MM-TT</target>
        <jms:reference-file line="10">web/report/form_date_and_base.html.twig</jms:reference-file>
        <jms:reference-file line="20">web/report/form_date_and_base.html.twig</jms:reference-file>
      </trans-unit>
@@ -7940,9 +7940,9 @@
        <target state="translated">Ihre Media und Unterauflösungen (Voransichten, Miniaturansichten..) werden in diese Verzeichnisse gespeichert.</target>
        <jms:reference-file line="736">web/setup/step2.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="bd5a589e9bed2de0b0180ca950ea0593249f7f69" resname="Your phraseanet account on %urlInstance% has been deleted!">
+      <trans-unit id="bd5a589e9bed2de0b0180ca950ea0593249f7f69" resname="Your phraseanet account on %urlInstance% has been deleted!" approved="yes">
        <source>Your phraseanet account on %urlInstance% has been deleted!</source>
-        <target state="needs-translation">Ihr Benutzerkonto auf %urlInstance% wurde gelöscht!</target>
+        <target state="translated">Ihr Benutzerkonto auf %urlInstance% wurde gelöscht!</target>
        <jms:reference-file line="29">Notification/Mail/MailSuccessAccountDelete.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="257253d658fdcbe73c4f4d02d2a3442ea8e4011d" resname="Your registration requests have been taken into account." approved="yes">
@@ -8903,34 +8903,34 @@
        <target state="translated">Ein Benutzer hat sich angemeldet</target>
        <jms:reference-file line="29">Notification/Mail/MailInfoSomebodyAutoregistered.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="d515b5152446301602332e06b1d84bf3974ca24d" resname="admin::search-engine: general-aggregation">
+      <trans-unit id="d515b5152446301602332e06b1d84bf3974ca24d" resname="admin::search-engine: general-aggregation" approved="yes">
        <source>admin::search-engine: general-aggregation</source>
-        <target state="needs-translation">Aggregateinstellungen</target>
+        <target state="translated">Aggregateinstellungen</target>
        <jms:reference-file line="5">admin/search-engine/search-engine-settings.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="08772ff0da8ce970d5fac07a7afb6f855401d235" resname="admin::setup:personalisation_logo: download gabari">
+      <trans-unit id="08772ff0da8ce970d5fac07a7afb6f855401d235" resname="admin::setup:personalisation_logo: download gabari" approved="yes">
        <source>admin::setup:personalisation_logo: download gabari</source>
-        <target state="new">admin::setup:personalisation_logo: download gabari</target>
+        <target state="translated">Template herunterladen</target>
        <jms:reference-file line="18">web/admin/personalisation_logo.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="a051f8357ca68bd96210d071cdfacfe8a54de2af" resname="admin::setup:personalisation_logo: error text dimension">
+      <trans-unit id="a051f8357ca68bd96210d071cdfacfe8a54de2af" resname="admin::setup:personalisation_logo: error text dimension" approved="yes">
        <source>admin::setup:personalisation_logo: error text dimension</source>
-        <target state="new">admin::setup:personalisation_logo: error text dimension</target>
+        <target state="translated">Fehler: Dateigrösse ist falsch, bitte wählen Sie aus: 120 x 41 px in .png</target>
        <jms:reference-file line="44">web/admin/personalisation_logo.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="4499d392aa84b8bf806252937b820281034ffd0c" resname="admin::setup:personalisation_logo: error text file type">
+      <trans-unit id="4499d392aa84b8bf806252937b820281034ffd0c" resname="admin::setup:personalisation_logo: error text file type" approved="yes">
        <source>admin::setup:personalisation_logo: error text file type</source>
-        <target state="new">admin::setup:personalisation_logo: error text file type</target>
+        <target state="translated">Fehler: Das Datei-Format ist falsch, bitte wählen Sie eine Datei in .png</target>
        <jms:reference-file line="45">web/admin/personalisation_logo.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="78a276b502761ddad6d621bf315ed17362b12748" resname="admin::setup:personalisation_logo: help text">
+      <trans-unit id="78a276b502761ddad6d621bf315ed17362b12748" resname="admin::setup:personalisation_logo: help text" approved="yes">
        <source>admin::setup:personalisation_logo: help text</source>
-        <target state="new">admin::setup:personalisation_logo: help text</target>
+        <target state="translated">Importieren Sie Ihr Logo: 120 x 41 px max in .png</target>
        <jms:reference-file line="16">web/admin/personalisation_logo.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="1ae037eda66d81b87705cdbdc04e4d8c0a953755" resname="admin::setup:personalisation_logo: select file">
+      <trans-unit id="1ae037eda66d81b87705cdbdc04e4d8c0a953755" resname="admin::setup:personalisation_logo: select file" approved="yes">
        <source>admin::setup:personalisation_logo: select file</source>
-        <target state="new">admin::setup:personalisation_logo: select file</target>
+        <target state="translated">Datei auswählen</target>
        <jms:reference-file line="31">web/admin/personalisation_logo.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="8fb48b51ad1962dc1b6a3643964f38fc48853161" resname="admin::status: case A" approved="yes">
@@ -9646,9 +9646,9 @@
        <target state="new">create_subdef_modal_subdefinition_name</target>
        <jms:reference-file line="354">web/admin/subdefs.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="670f6628c7b72287a36ecd01262005e81428451c" resname="created_on">
+      <trans-unit id="670f6628c7b72287a36ecd01262005e81428451c" resname="created_on" approved="yes">
        <source>created_on</source>
-        <target state="new">created_on</target>
+        <target state="translated">erstellt am</target>
        <jms:reference-file line="466">web/prod/index.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="fc97186645dc71dae8e3221c8ce53c56e6d611bf" resname="dans %category%" approved="yes">
@@ -9797,9 +9797,9 @@
        <jms:reference-file line="103">web/common/dialog_export.html.twig</jms:reference-file>
        <jms:reference-file line="116">web/common/dialog_export.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="fcf5093722566a47fe3e773296cc63fac7190dac" resname="export::export-email: email-invalid">
+      <trans-unit id="fcf5093722566a47fe3e773296cc63fac7190dac" resname="export::export-email: email-invalid" approved="yes">
        <source>export::export-email: email-invalid</source>
-        <target state="needs-translation">Das Format der Email Adresse scheint falsch zu sein</target>
+        <target state="translated">Das Format der Email Adresse scheint falsch zu sein</target>
        <jms:reference-file line="510">web/common/dialog_export.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="40a92233bac9303de825031d1954e6b109088b38" resname="export::ftp: reglages manuels" approved="yes">
@@ -9920,59 +9920,59 @@
        <target state="translated">Änderungen wurden hergestellt</target>
        <jms:reference-file line="14">admin/databox/databox.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="45b162f3c09db4eb9ecea5e048393a7ccaab4f7d" resname="help::help-section-bullet: check-spelling">
+      <trans-unit id="45b162f3c09db4eb9ecea5e048393a7ccaab4f7d" resname="help::help-section-bullet: check-spelling" approved="yes">
        <source>help::help-section-bullet: check-spelling</source>
-        <target state="needs-translation">Vergewissern Sie sich, dass kein Schreibfehler oder Tippfehler vorliegt</target>
+        <target state="translated">Vergewissern Sie sich, dass kein Schreibfehler oder Tippfehler vorliegt</target>
        <jms:reference-file line="17">prod/results/help.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="9be1244ce3eb4b1de4abe01d696f2ab14effa5ca" resname="help::help-section-bullet: default-operator-between-terms">
+      <trans-unit id="9be1244ce3eb4b1de4abe01d696f2ab14effa5ca" resname="help::help-section-bullet: default-operator-between-terms" approved="yes">
        <source>help::help-section-bullet: default-operator-between-terms</source>
-        <target state="needs-translation">Der Standardoperator zwischen den Suchbegriffen ist AND</target>
+        <target state="translated">Der Standardoperator zwischen den Suchbegriffen ist AND</target>
        <jms:reference-file line="26">prod/results/help.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="a939bc9799c52952fd10a0a4c27520ffb080abf8" resname="help::help-section-bullet: expand search">
+      <trans-unit id="a939bc9799c52952fd10a0a4c27520ffb080abf8" resname="help::help-section-bullet: expand search" approved="yes">
        <source>help::help-section-bullet: expand search</source>
-        <target state="needs-translation">Erweitern Sie die Suche mit weniger Schlüsselwörtern</target>
+        <target state="translated">Erweitern Sie die Suche mit weniger Schlüsselwörtern</target>
        <jms:reference-file line="20">prod/results/help.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="a1635ba73964dd21d9d5907401d77a11cd474611" resname="help::help-section-bullet: quotation-marks-allow">
+      <trans-unit id="a1635ba73964dd21d9d5907401d77a11cd474611" resname="help::help-section-bullet: quotation-marks-allow" approved="yes">
        <source>help::help-section-bullet: quotation-marks-allow</source>
-        <target state="needs-translation">Anführungszeichen ermöglichen die Suche nach zusammenhängenden Begriffen oder Ausdrücken in der Medienbeschreibung</target>
+        <target state="translated">Anführungszeichen ermöglichen die Suche nach zusammenhängenden Begriffen oder Ausdrücken in der Medienbeschreibung</target>
        <jms:reference-file line="29">prod/results/help.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="2c7c99c6e44d0f6117f812b18739f8990ebb8052" resname="help::help-section-bullet: remove-advance-search">
+      <trans-unit id="2c7c99c6e44d0f6117f812b18739f8990ebb8052" resname="help::help-section-bullet: remove-advance-search" approved="yes">
        <source>help::help-section-bullet: remove-advance-search</source>
-        <target state="needs-translation">Erweiterte Suchfilter entfernen</target>
+        <target state="translated">Erweiterte Suchfilter entfernen</target>
        <jms:reference-file line="19">prod/results/help.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="76544223abc0670157f5a270138a638283071678" resname="help::help-section-bullet: search-in-a-specific-field">
+      <trans-unit id="76544223abc0670157f5a270138a638283071678" resname="help::help-section-bullet: search-in-a-specific-field" approved="yes">
        <source>help::help-section-bullet: search-in-a-specific-field</source>
-        <target state="needs-translation">Verwenden Sie die erweiterte Suche, um in einem bestimmten Feld zu suchen</target>
+        <target state="translated">Verwenden Sie die erweiterte Suche, um in einem bestimmten Feld zu suchen</target>
        <jms:reference-file line="30">prod/results/help.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="ac8d5acf555e427edbdcb05033256148d4bf9204" resname="help::help-section-bullet: search-in-document">
+      <trans-unit id="ac8d5acf555e427edbdcb05033256148d4bf9204" resname="help::help-section-bullet: search-in-document" approved="yes">
        <source>help::help-section-bullet: search-in-document</source>
-        <target state="needs-translation">Nach Dokumente oder nach Berichte suchen</target>
+        <target state="translated">Nach Dokumente oder nach Berichte suchen</target>
        <jms:reference-file line="18">prod/results/help.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="d37e6d50ca4af373ad217e5c6aa905f0deb49791" resname="help::help-section-bullet: use-EXCEPT-operator">
+      <trans-unit id="d37e6d50ca4af373ad217e5c6aa905f0deb49791" resname="help::help-section-bullet: use-EXCEPT-operator" approved="yes">
        <source>help::help-section-bullet: use-EXCEPT-operator</source>
-        <target state="needs-translation">Der Operator EXCEPT erlaubt, ein Begriff von der Suche auszuschliessen</target>
+        <target state="translated">Der Operator EXCEPT erlaubt, ein Begriff von der Suche auszuschliessen</target>
        <jms:reference-file line="28">prod/results/help.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="f1705105cd12c7037b4a27b97b9453602ac45ebd" resname="help::help-section-bullet: use-OR-between-terms">
+      <trans-unit id="f1705105cd12c7037b4a27b97b9453602ac45ebd" resname="help::help-section-bullet: use-OR-between-terms" approved="yes">
        <source>help::help-section-bullet: use-OR-between-terms</source>
-        <target state="needs-translation">Der Operator OR erlaubt, mehrere Begriffe der Medien Beschreibung zu suchen</target>
+        <target state="translated">Der Operator OR erlaubt, mehrere Begriffe der Medien Beschreibung zu suchen</target>
        <jms:reference-file line="27">prod/results/help.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="c012913adefe76f9285c687ed30146a950f95c2c" resname="help::help-section-title: search-tips">
+      <trans-unit id="c012913adefe76f9285c687ed30146a950f95c2c" resname="help::help-section-title: search-tips" approved="yes">
        <source>help::help-section-title: search-tips</source>
-        <target state="needs-translation">Einige Suchtipps:</target>
+        <target state="translated">Einige Suchtipps:</target>
        <jms:reference-file line="24">prod/results/help.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="d432c25580313c9fdcd73ee53506d69d852cd2cd" resname="help::help-section-title: sorry-no-result">
+      <trans-unit id="d432c25580313c9fdcd73ee53506d69d852cd2cd" resname="help::help-section-title: sorry-no-result" approved="yes">
        <source>help::help-section-title: sorry-no-result</source>
-        <target state="needs-translation">Sorry, Ihre Suche liefert keine Ergebnisse</target>
+        <target state="translated">Sorry, Ihre Suche liefert keine Ergebnisse</target>
        <jms:reference-file line="15">prod/results/help.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="0e76292794888d4f1fa75fb3aff4ca27c58f56a6" resname="image" approved="yes">
@@ -10002,19 +10002,19 @@
        <target state="new">index::advance_search: facet</target>
        <jms:reference-file line="803">web/prod/index.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="2f830d57f4cedb2a49c7b109f9b91b0f8ba83e8b" resname="index::advance_search: facet-order">
+      <trans-unit id="2f830d57f4cedb2a49c7b109f9b91b0f8ba83e8b" resname="index::advance_search: facet-order" approved="yes">
        <source>index::advance_search: facet-order</source>
-        <target state="needs-translation">Reihenfolge der Facettenanzeige</target>
+        <target state="translated">Reihenfolge der Facettenanzeige</target>
        <jms:reference-file line="804">web/prod/index.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="5a25478cdd7fe21258071c4f3a5d9920225f9356" resname="index::advance_search: facet-tech-order">
+      <trans-unit id="5a25478cdd7fe21258071c4f3a5d9920225f9356" resname="index::advance_search: facet-tech-order" approved="yes">
        <source>index::advance_search: facet-tech-order</source>
-        <target state="needs-translation">Technische Reihenfolge</target>
+        <target state="translated">Standard Reihenfolge</target>
        <jms:reference-file line="810">web/prod/index.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="6b9516a3c46d7ad246a9fbb3df693ba6c783c986" resname="index::advance_search: facet-values-order">
+      <trans-unit id="6b9516a3c46d7ad246a9fbb3df693ba6c783c986" resname="index::advance_search: facet-values-order" approved="yes">
        <source>index::advance_search: facet-values-order</source>
-        <target state="needs-translation">Reihenfolge der Facettenwerte</target>
+        <target state="translated">Reihenfolge der Facettenwerte</target>
        <jms:reference-file line="816">web/prod/index.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="dfb02fcdeb804315cd6ad8388efcfb4ccc4abf38" resname="index::advance_search: hidden-facet-values-order">
@@ -10022,9 +10022,9 @@
        <target state="new">index::advance_search: hidden-facet-values-order</target>
        <jms:reference-file line="833">web/prod/index.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="4a35cc75d1072f7dad99c8e91596298f55f20a54" resname="index::advance_search: order-by-hits">
+      <trans-unit id="4a35cc75d1072f7dad99c8e91596298f55f20a54" resname="index::advance_search: order-by-hits" approved="yes">
        <source>index::advance_search: order-by-hits</source>
-        <target state="needs-translation">Nach Hits sortieren</target>
+        <target state="translated">Nach Hits sortieren</target>
        <jms:reference-file line="822">web/prod/index.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="1039a002699408da4c4fe74638a6b44f60499069" resname="index:advanced-preferences:: use truncation">
@@ -10256,7 +10256,7 @@
      </trans-unit>
      <trans-unit id="1758356db21759f7c5a0da9b4dd1db8fd6feab3f" resname="or" approved="yes">
        <source>or</source>
-        <target state="translated">oder</target>
+        <target state="translated">Or</target>
        <jms:reference-file line="136">Controller/Prod/LanguageController.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="c63be34306e4a9f792a8ee15b97659affe4ad97e" resname="order-manager::mail: your-order-of">
@@ -10505,9 +10505,9 @@
        <jms:reference-file line="117">prod/orders/order_box.html.twig</jms:reference-file>
        <jms:reference-file line="168">prod/orders/order_box.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="0259e4e17a1f2697d4f4f0108080276a5d7573de" resname="original logo">
+      <trans-unit id="0259e4e17a1f2697d4f4f0108080276a5d7573de" resname="original logo" approved="yes">
        <source>original logo</source>
-        <target state="new">original logo</target>
+        <target state="translated">Originales logo</target>
        <jms:reference-file line="23">Form/Configuration/PersonalisationLogoFormType.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="5898fc860300e228dcd54c0b1045b5fa0dcda502" resname="oui" approved="yes">
@@ -10803,19 +10803,19 @@
        <target state="translated">Diese Meldung nicht mehr anzeigen</target>
        <jms:reference-file line="38">Controller/Prod/LanguageController.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="245fd09d0518644a6580518f710add762804ca9a" resname="phraseanet::account The account has been deleted">
+      <trans-unit id="245fd09d0518644a6580518f710add762804ca9a" resname="phraseanet::account The account has been deleted" approved="yes">
        <source>phraseanet::account The account has been deleted</source>
-        <target state="needs-translation">Ihr Benutzerkonto wurde gelöscht</target>
+        <target state="translated">Ihr Benutzerkonto wurde gelöscht</target>
        <jms:reference-file line="544">Controller/Root/AccountController.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="bf7028b694aea3fc9ede5014a9f8b5d617b83b6f" resname="phraseanet::account: &lt;&lt; your account can be deleted via admin interface &gt;&gt; ">
+      <trans-unit id="bf7028b694aea3fc9ede5014a9f8b5d617b83b6f" resname="phraseanet::account: &lt;&lt; your account can be deleted via admin interface &gt;&gt; " approved="yes">
        <source><![CDATA[phraseanet::account: << your account can be deleted via admin interface >> ]]></source>
-        <target state="needs-translation">Ihr Benutzerkonto kann nur durch die Administration Anwendung gelöscht werden.</target>
+        <target state="translated">Ihr Benutzerkonto kann nur durch die Administration Anwendung gelöscht werden.</target>
        <jms:reference-file line="296">web/account/account.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="047b7994f5960aae108105ad5deadb5bbd72c8fc" resname="phraseanet::account: A confirmation e-mail has been sent. Please follow the instructions contained to continue account deletion" approved="yes">
        <source>phraseanet::account: A confirmation e-mail has been sent. Please follow the instructions contained to continue account deletion</source>
-        <target state="translated">Eine Bestätigungs-E-Mail wurde gesendet. Bitte folgen Sie den Anweisungen der fortlaufenden Kontenlöschung</target>
+        <target state="translated">Eine Bestätigungs-E-Mail wurde gesendet. Bitte folgen Sie den Anweisungen der fortlaufenden Kontolöschung</target>
        <jms:reference-file line="360">Controller/Root/AccountController.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="d0ee9e2c90a05b113b00bf7accd590557bd78528" resname="phraseanet::account: Are you sure you want to delete your account?" approved="yes">
@@ -10823,9 +10823,9 @@
        <target state="translated">Möchten Sie Ihr Konto wirklich löschen?</target>
        <jms:reference-file line="253">web/account/account.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="b98be91d0f8cadb22e52e6217584b7a11370fbb6" resname="phraseanet::account: Delete my account">
+      <trans-unit id="b98be91d0f8cadb22e52e6217584b7a11370fbb6" resname="phraseanet::account: Delete my account" approved="yes">
        <source>phraseanet::account: Delete my account</source>
-        <target state="needs-translation">Mein Benutzerkonto löschen</target>
+        <target state="translated">Mein Benutzerkonto löschen</target>
        <jms:reference-file line="244">web/account/account.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="b7993903466c49139bfae4c34c63446ff24b1474" resname="phraseanet::account: I am agree to delete my account" approved="yes">
@@ -10843,9 +10843,9 @@
        <target state="translated">Liste der zu löschenden Daten</target>
        <jms:reference-file line="254">web/account/account.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="8d168955d9cfb26df27fbdcb4f83bbfe78654703" resname="phraseanet::account: My phraseanet account">
+      <trans-unit id="8d168955d9cfb26df27fbdcb4f83bbfe78654703" resname="phraseanet::account: My phraseanet account" approved="yes">
        <source>phraseanet::account: My phraseanet account</source>
-        <target state="needs-translation">Mein Phraseanet Benutzerkonto</target>
+        <target state="translated">Mein Phraseanet Benutzerkonto</target>
        <jms:reference-file line="274">web/account/account.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="9628f29074afd5c9bb42bb0b4c896f8bc32c192e" resname="phraseanet::chargement" approved="yes">
@@ -11147,9 +11147,9 @@
        <target state="translated">Sie haben keine Berechtigung, diesen Vorgang auf diese Dokumente durchzuführen</target>
        <jms:reference-file line="35">Controller/Prod/MoveCollectionController.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="ef27ad74061e0e15683e84dec7f5559f7797637f" resname="prod::advancesearch:tooltips:datefield_restriction_explanation">
+      <trans-unit id="ef27ad74061e0e15683e84dec7f5559f7797637f" resname="prod::advancesearch:tooltips:datefield_restriction_explanation" approved="yes">
        <source>prod::advancesearch:tooltips:datefield_restriction_explanation</source>
-        <target state="needs-translation">Suchergebnisse auf Datum beschränken</target>
+        <target state="translated">Suchergebnisse auf Datum beschränken</target>
        <jms:reference-file line="453">web/prod/index.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="fa55093d5fb1dfe235a46f8b4fecad5d36d3f250" resname="prod::advancesearch:tooltips:field_restriction_explanation">
@@ -11418,24 +11418,24 @@
        <jms:reference-file line="70">Controller/Prod/ToolsController.php</jms:reference-file>
        <jms:reference-file line="41">Controller/Prod/ShareController.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="501adfe6ea4c900a76df9f3c1d55834e6db5b9a9" resname="prod:app trash: also-move-record">
+      <trans-unit id="501adfe6ea4c900a76df9f3c1d55834e6db5b9a9" resname="prod:app trash: also-move-record" approved="yes">
        <source>prod:app trash: also-move-record</source>
-        <target state="needs-translation">Datensätze auch in den Papierkorb verschieben, die mit Berichten verknüpft sind</target>
+        <target state="translated">Datensätze auch in den Papierkorb verschieben, die mit Berichten verknüpft sind</target>
        <jms:reference-file line="28">prod/actions/delete_records_confirm.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="9dd9daa2dc851f005bbcb2ce0ea0c8de6b86ad52" resname="prod:app trash: record-delete">
+      <trans-unit id="9dd9daa2dc851f005bbcb2ce0ea0c8de6b86ad52" resname="prod:app trash: record-delete" approved="yes">
        <source>prod:app trash: record-delete</source>
-        <target state="needs-translation">Datensatz (¨e) dauerhaft gelöscht!</target>
+        <target state="translated">Datensatz (¨e) dauerhaft gelöscht!</target>
        <jms:reference-file line="40">prod/actions/delete_records_confirm.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="9dcc690970b62ae5d2f6e2bf25213650f69d44ea" resname="prod:app trash: record-move-to-trash">
+      <trans-unit id="9dcc690970b62ae5d2f6e2bf25213650f69d44ea" resname="prod:app trash: record-move-to-trash" approved="yes">
        <source>prod:app trash: record-move-to-trash</source>
-        <target state="needs-translation">Datensatz (¨e) in den Papierkorb verschoben</target>
+        <target state="translated">Datensatz (¨e) in den Papierkorb verschoben</target>
        <jms:reference-file line="23">prod/actions/delete_records_confirm.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="054aec17d6db5d5ab74b6bf4440acfd5a9fdc09d" resname="prod:app trash: title-trash">
+      <trans-unit id="054aec17d6db5d5ab74b6bf4440acfd5a9fdc09d" resname="prod:app trash: title-trash" approved="yes">
        <source>prod:app trash: title-trash</source>
-        <target state="needs-translation">Datensatz (¨e) In den Papierkorb verschieben</target>
+        <target state="translated">Datensatz (¨e) In den Papierkorb verschieben</target>
        <jms:reference-file line="44">Controller/Prod/LanguageController.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="d75ccc6722ace63fbdb430baa7a12dc93d13ff74" resname="prod:edit: chapters">
@@ -11685,9 +11685,9 @@
        <target state="translated">Datenbank</target>
        <jms:reference-file line="26">web/report/form_date_and_base.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="49e279e2253aaf0d8aebad389584f5c7c77e5a78" resname="report:: 3 - Collections">
+      <trans-unit id="49e279e2253aaf0d8aebad389584f5c7c77e5a78" resname="report:: 3 - Collections" approved="yes">
        <source>report:: 3 - Collections</source>
-        <target state="needs-translation">Kollektionen</target>
+        <target state="translated">Kollektionen</target>
        <jms:reference-file line="39">web/report/form_date_and_base.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="a807c0ef7e32813081616c65bbc134acdf30666b" resname="report:: 3 - Type de report">
@@ -11713,9 +11713,9 @@
        <jms:reference-file line="9">web/report/report_layout.html.twig</jms:reference-file>
        <jms:reference-file line="25">web/report/all_content.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="afa9685c95f7dff29cb2ad048da368c6e3dbadbc" resname="report:: Databox content">
+      <trans-unit id="afa9685c95f7dff29cb2ad048da368c6e3dbadbc" resname="report:: Databox content" approved="yes">
        <source>report:: Databox content</source>
-        <target state="needs-translation">Databox Inhalt</target>
+        <target state="translated">Databox Inhalt</target>
        <jms:reference-file line="11">web/report/report_layout.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="afa00f7f0e9cf982c242e1a53235360b4aac707d" resname="report:: Detail des connexions" approved="yes">
@@ -12202,65 +12202,65 @@
        <target state="translated">Test E-Mail Überprüfungen</target>
        <jms:reference-file line="127">web/admin/dashboard.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="cf75de5e3a89d03d1888b4caccfafc65f6456fc3" resname="setup::custom-link:add-link">
+      <trans-unit id="cf75de5e3a89d03d1888b4caccfafc65f6456fc3" resname="setup::custom-link:add-link" approved="yes">
        <source>setup::custom-link:add-link</source>
-        <target state="needs-translation">Link hinzufügen</target>
+        <target state="translated">Link hinzufügen</target>
        <jms:reference-file line="78">web/admin/setup.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="44a5de1cdcf30547c937f197cd3d58e143de62a6" resname="setup::custom-link:help-menu">
+      <trans-unit id="44a5de1cdcf30547c937f197cd3d58e143de62a6" resname="setup::custom-link:help-menu" approved="yes">
        <source>setup::custom-link:help-menu</source>
-        <target state="needs-translation">Hilfemenü</target>
+        <target state="translated">Hilfemenü</target>
        <jms:reference-file line="58">Form/Configuration/CustomLinkFormType.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="0286ea45f1074802cfe8fbf84b7c439fb287d0de" resname="setup::custom-link:language-link">
+      <trans-unit id="0286ea45f1074802cfe8fbf84b7c439fb287d0de" resname="setup::custom-link:language-link" approved="yes">
        <source>setup::custom-link:language-link</source>
-        <target state="needs-translation">Sprache:</target>
+        <target state="translated">Sprache:</target>
        <jms:reference-file line="98">web/admin/setup.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="51269c7ad5acb4ebf70560266a8739d608285ac4" resname="setup::custom-link:link-url">
+      <trans-unit id="51269c7ad5acb4ebf70560266a8739d608285ac4" resname="setup::custom-link:link-url" approved="yes">
        <source>setup::custom-link:link-url</source>
-        <target state="needs-translation">Ziel-URL</target>
+        <target state="translated">Ziel-URL</target>
        <jms:reference-file line="99">web/admin/setup.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="2de3bc78c6fb26b56dd934a81dc76afdba8c79ab" resname="setup::custom-link:location">
+      <trans-unit id="2de3bc78c6fb26b56dd934a81dc76afdba8c79ab" resname="setup::custom-link:location" approved="yes">
        <source>setup::custom-link:location</source>
-        <target state="needs-translation">Ort auswählen</target>
+        <target state="translated">Ort auswählen</target>
        <jms:reference-file line="57">Form/Configuration/CustomLinkFormType.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="f4db79dfecabb4b9acb44a4b49e9b6b433b28d04" resname="setup::custom-link:location-link">
+      <trans-unit id="f4db79dfecabb4b9acb44a4b49e9b6b433b28d04" resname="setup::custom-link:location-link" approved="yes">
        <source>setup::custom-link:location-link</source>
-        <target state="needs-translation">Ort des Links</target>
+        <target state="translated">Ort des Links</target>
        <jms:reference-file line="100">web/admin/setup.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="ccfe45428ee9769a865d3d90c0e4dc50a6b68e9c" resname="setup::custom-link:name-link">
+      <trans-unit id="ccfe45428ee9769a865d3d90c0e4dc50a6b68e9c" resname="setup::custom-link:name-link" approved="yes">
        <source>setup::custom-link:name-link</source>
-        <target state="needs-translation">Links Name</target>
+        <target state="translated">Links Name</target>
        <jms:reference-file line="23">Form/Configuration/CustomLinkFormType.php</jms:reference-file>
        <jms:reference-file line="97">web/admin/setup.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="fdecb6454c7adeaeb05bac7f574ee70884900ca2" resname="setup::custom-link:navigation-bar">
+      <trans-unit id="fdecb6454c7adeaeb05bac7f574ee70884900ca2" resname="setup::custom-link:navigation-bar" approved="yes">
        <source>setup::custom-link:navigation-bar</source>
-        <target state="needs-translation">Navigationsleiste</target>
+        <target state="translated">Navigationsleiste</target>
        <jms:reference-file line="59">Form/Configuration/CustomLinkFormType.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="4696021003b181f9acc9261382e07364c6b83036" resname="setup::custom-link:order-link">
+      <trans-unit id="4696021003b181f9acc9261382e07364c6b83036" resname="setup::custom-link:order-link" approved="yes">
        <source>setup::custom-link:order-link</source>
-        <target state="needs-translation">Anzeigereihenfolge</target>
+        <target state="translated">Anzeigereihenfolge</target>
        <jms:reference-file line="101">web/admin/setup.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="1b09a3a0a8b0205f23b3fe59074f8dfd72d0b0ae" resname="setup::custom-link:placeholder-link-url">
+      <trans-unit id="1b09a3a0a8b0205f23b3fe59074f8dfd72d0b0ae" resname="setup::custom-link:placeholder-link-url" approved="yes">
        <source>setup::custom-link:placeholder-link-url</source>
-        <target state="needs-translation">zB: https://docs.phraseanet.com</target>
+        <target state="translated">zB: https://docs.phraseanet.com</target>
        <jms:reference-file line="47">Form/Configuration/CustomLinkFormType.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="a1380c70f5190d6c0c38214fe24ac99272ef7bd2" resname="setup::custom-link:select-language">
+      <trans-unit id="a1380c70f5190d6c0c38214fe24ac99272ef7bd2" resname="setup::custom-link:select-language" approved="yes">
        <source>setup::custom-link:select-language</source>
-        <target state="needs-translation">Sprache auswählen</target>
+        <target state="translated">Sprache auswählen</target>
        <jms:reference-file line="34">Form/Configuration/CustomLinkFormType.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="67572283912404fe90681e8566d880e1fd10d58e" resname="setup::custom-link:title-custom-link">
+      <trans-unit id="67572283912404fe90681e8566d880e1fd10d58e" resname="setup::custom-link:title-custom-link" approved="yes">
        <source>setup::custom-link:title-custom-link</source>
-        <target state="needs-translation">Custom Link</target>
+        <target state="translated">Custom Link</target>
        <jms:reference-file line="69">web/admin/setup.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="5107f9819cd4c0812c1d78cc07d24aff304c58fa" resname="share::share-record: advance" approved="yes">
@@ -12268,9 +12268,9 @@
        <target state="translated">Erweiterte Einstellung</target>
        <jms:reference-file line="9">prod/Share/record.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="f51d8ca24dc67572beccf115c79671ba1c3f545a" resname="share::share-record: select-shared-def">
+      <trans-unit id="f51d8ca24dc67572beccf115c79671ba1c3f545a" resname="share::share-record: select-shared-def" approved="yes">
        <source>share::share-record: select-shared-def</source>
-        <target state="needs-translation">Wählen Sie die Unterauflösung zum Teilen aus</target>
+        <target state="translated">Wählen Sie die Unterauflösung zum Teilen aus</target>
        <jms:reference-file line="11">prod/Share/record.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="98693e37d002821e032bfc91ffc5091c3b6d76da" resname="status:: Affichable pour tous" approved="yes">
--- a/resources/locales/messages.en.xlf
+++ b/resources/locales/messages.en.xlf
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='utf-8'?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
  <file date="2019-05-21T05:54:15Z" source-language="en" target-language="en" datatype="plaintext" original="not.available">
    <header>
@@ -7,8 +7,8 @@
    </header>
    <body>
      <trans-unit id="da39a3ee5e6b4b0d3255bfef95601890afd80709" resname="">
-        <source></source>
-        <target state="new"></target>
+        <source/>
+        <target state="new"/>
        <jms:reference-file line="60">Form/Login/PhraseaAuthenticationForm.php</jms:reference-file>
        <jms:reference-file line="47">Form/Configuration/EmailFormType.php</jms:reference-file>
      </trans-unit>
@@ -662,9 +662,9 @@
        <target state="translated">Activate a collection</target>
        <jms:reference-file line="184">admin/databox/databox.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="81c0d915fa6d82fd30661c5e66e204cea52bb2b5" resname="Activity">
+      <trans-unit id="81c0d915fa6d82fd30661c5e66e204cea52bb2b5" resname="Activity" approved="yes">
        <source>Activity</source>
-        <target state="new">Activity</target>
+        <target state="translated">Activity</target>
        <jms:reference-file line="170">actions/Feedback/list.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="61cc55aa0453184734c3fa0b621eda6fa874bd83" resname="Add" approved="yes">
@@ -682,9 +682,9 @@
                    new field</target>
        <jms:reference-file line="43">admin/fields/templates.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="c4e29ed18c13ce03d9ae30560dfc80bf47c0c86c" resname="Add a list">
+      <trans-unit id="c4e29ed18c13ce03d9ae30560dfc80bf47c0c86c" resname="Add a list" approved="yes">
        <source>Add a list</source>
-        <target state="new">Add a list</target>
+        <target state="translated">Add a list</target>
        <jms:reference-file line="8">actions/Feedback/lists-all.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="5bc397abf190599d339e7a0543f2ba2a6dbc8e38" resname="Add a new field" approved="yes">
@@ -717,9 +717,9 @@
        <target state="translated">Add new chapter</target>
        <jms:reference-file line="138">Controller/Prod/LanguageController.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="1b27740ce4d6bea2dd21cee1c12fa73206c1444a" resname="Add this url">
+      <trans-unit id="1b27740ce4d6bea2dd21cee1c12fa73206c1444a" resname="Add this url" approved="yes">
        <source>Add this url</source>
-        <target state="new">Add this url</target>
+        <target state="translated">Add this url</target>
        <jms:reference-file line="36">prod/upload/upload.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="f347a8ddd22508ed0310a2f9d8cf43dd96be34b1" resname="Add user" approved="yes">
@@ -758,9 +758,9 @@
        <target state="translated">Advanced search</target>
        <jms:reference-file line="282">web/prod/index.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="36ee3c1fd529ba9fd031d157e04c6fecb356591c" resname="Advanced mode">
+      <trans-unit id="36ee3c1fd529ba9fd031d157e04c6fecb356591c" resname="Advanced mode" approved="yes">
        <source>Advanced mode</source>
-        <target state="new">Advanced mode</target>
+        <target state="translated">Advanced mode</target>
        <jms:reference-file line="49">actions/Feedback/list.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="2e8bbf396d28ec55f8a6987f31422f44b693a08c" resname="Advanced settings" approved="yes">
@@ -860,9 +860,9 @@
        <jms:reference-file line="239">actions/Feedback/list.html.twig</jms:reference-file>
        <jms:reference-file line="8">task-manager/task-editor/subdefs.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="cff1e86ef3cd4771d8b9a289d1e75a465d5b48a7" resname="All these conditions">
+      <trans-unit id="cff1e86ef3cd4771d8b9a289d1e75a465d5b48a7" resname="All these conditions" approved="yes">
        <source>All these conditions</source>
-        <target state="new">All these conditions</target>
+        <target state="translated">All these conditions</target>
        <jms:reference-file line="404">web/prod/index.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="4f5920cee28837f31429fd82f7bc5a335272a436" resname="All values" approved="yes">
@@ -1272,9 +1272,9 @@
        <target state="translated">Audio Samplerate</target>
        <jms:reference-file line="339">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="31afcc88a7f552bfd4d330c2c70d8fafd7b8e0f9" resname="Audio channel">
+      <trans-unit id="31afcc88a7f552bfd4d330c2c70d8fafd7b8e0f9" resname="Audio channel" approved="yes">
        <source>Audio channel</source>
-        <target state="new">Audio channel</target>
+        <target state="translated">Audio channel</target>
        <jms:reference-file line="38">Media/Subdef/Audio.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="bdeea21f6257f434dcfcffb4f0470a042a1b5c17" resname="Audio codec" approved="yes">
@@ -1953,9 +1953,9 @@
        <target state="translated">Check Online for required list of components and web server setup</target>
        <jms:reference-file line="311">web/setup/step2.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="33e15d008d511f3101566a2e25203ef2a3f605a0" resname="Contains">
+      <trans-unit id="33e15d008d511f3101566a2e25203ef2a3f605a0" resname="Contains" approved="yes">
        <source>Contains</source>
-        <target state="new">Contains</target>
+        <target state="translated">Contains</target>
        <jms:reference-file line="423">web/prod/index.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="34326e71e2592544dedcb84077a6317dc5a5e700" resname="Continuer ?" approved="yes">
@@ -2019,9 +2019,9 @@
        <jms:reference-file line="179">actions/Feedback/list.html.twig</jms:reference-file>
        <jms:reference-file line="36">actions/Feedback/ListsMacros.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="1a86d07315c59a10355c667fbd3cdd3d813aa476" resname="Create a user">
+      <trans-unit id="1a86d07315c59a10355c667fbd3cdd3d813aa476" resname="Create a user" approved="yes">
        <source>Create a user</source>
-        <target state="new">Create a user</target>
+        <target state="translated">Create a user</target>
        <jms:reference-file line="16">actions/Feedback/list.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="233c58630043458775b6173975ce442f854a9c77" resname="Create an account manually" approved="yes">
@@ -2232,9 +2232,9 @@
        <target state="translated">Creation date</target>
        <jms:reference-file line="55">admin/publications/list.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="ae5ac088b6ef50c2a9e1ccf96d6f3c6d65cc4c05" resname="Date Updated">
+      <trans-unit id="ae5ac088b6ef50c2a9e1ccf96d6f3c6d65cc4c05" resname="Date Updated" approved="yes">
        <source>Date Updated</source>
-        <target state="new">Date Updated</target>
+        <target state="translated">Date Updated</target>
        <jms:reference-file line="370">web/prod/index.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="910c2f8e114bda3eef68b7f17eee5e864be52dc4" resname="Date de connexion" approved="yes">
@@ -2242,9 +2242,9 @@
        <target state="translated">Login date</target>
        <jms:reference-file line="22">web/account/sessions.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="d5e8d1af5f3c137fb998b7afa347eeea683a7229" resname="Date de création">
+      <trans-unit id="d5e8d1af5f3c137fb998b7afa347eeea683a7229" resname="Date de création" approved="yes">
        <source>Date de création</source>
-        <target state="new">Date de création</target>
+        <target state="translated">Creation date</target>
        <jms:reference-file line="10">prod/Baskets/Reorder.html.twig</jms:reference-file>
        <jms:reference-file line="9">prod/Story/Reorder.html.twig</jms:reference-file>
      </trans-unit>
@@ -2255,15 +2255,15 @@
        <jms:reference-file line="103">prod/orders/order_box.html.twig</jms:reference-file>
        <jms:reference-file line="154">prod/orders/order_box.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="c004345fde85bded2c74513e29c8cd58d74b594f" resname="Date de modification">
+      <trans-unit id="c004345fde85bded2c74513e29c8cd58d74b594f" resname="Date de modification" approved="yes">
        <source>Date de modification</source>
-        <target state="new">Date de modification</target>
+        <target state="translated">Modification date</target>
        <jms:reference-file line="11">prod/Baskets/Reorder.html.twig</jms:reference-file>
        <jms:reference-file line="10">prod/Story/Reorder.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="ce084029e351b4bfa9f425ae70e8aaa14a8904e5" resname="Date(s) from field(s)">
+      <trans-unit id="ce084029e351b4bfa9f425ae70e8aaa14a8904e5" resname="Date(s) from field(s)" approved="yes">
        <source>Date(s) from field(s)</source>
-        <target state="new">Date(s) from field(s)</target>
+        <target state="translated">Date(s) from field(s)</target>
        <jms:reference-file line="449">web/prod/index.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="6b98c9b528241fc8135fb9fd472c7db12ec14964" resname="De" approved="yes">
@@ -2366,9 +2366,9 @@
        <jms:reference-file line="352">prod/upload/lazaret.html.twig</jms:reference-file>
        <jms:reference-file line="25">admin/task-manager/templates.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="1b5737dea168495fa0495e00ce58b4832772a492" resname="Delete account successfull">
+      <trans-unit id="1b5737dea168495fa0495e00ce58b4832772a492" resname="Delete account successfull" approved="yes">
        <source>Delete account successfull</source>
-        <target state="needs-translation">Account deleted successfully</target>
+        <target state="translated">Account deleted successfully</target>
        <jms:reference-file line="21">Notification/Mail/MailSuccessAccountDelete.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="7533d4121d8de10e9b2b4b9c5afa5dfbde846af1" resname="Delete all users rights" approved="yes">
@@ -2392,14 +2392,14 @@
        <target state="translated">Delete records</target>
        <jms:reference-file line="43">Controller/Prod/LanguageController.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="c6d08354792522fdbda121b635282d0f2c41c507" resname="Delete the selection">
+      <trans-unit id="c6d08354792522fdbda121b635282d0f2c41c507" resname="Delete the selection" approved="yes">
        <source>Delete the selection</source>
-        <target state="new">Delete the selection</target>
+        <target state="translated">Delete the selection</target>
        <jms:reference-file line="68">actions/Feedback/list.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="5934638eb5d7384a3c63899019365bb9b7b53aff" resname="Delete the subview ?">
+      <trans-unit id="5934638eb5d7384a3c63899019365bb9b7b53aff" resname="Delete the subview ?" approved="yes">
        <source>Delete the subview ?</source>
-        <target state="new">Delete the subview ?</target>
+        <target state="translated">Delete the subview ?</target>
        <jms:reference-file line="343">web/admin/subdefs.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="eedc3da946c6f6f8cca37df0edc42543d09e1464" resname="Demarrer avec l'API Phraseanet" approved="yes">
@@ -2464,9 +2464,9 @@
        <jms:reference-file line="71">web/report/report_layout_child.html.twig</jms:reference-file>
        <jms:reference-file line="48">web/report/form_date_and_base.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="fd281ce85e6f98a7dad0aa31a2e493a85ef178ca" resname="Design of personalization logo section">
+      <trans-unit id="fd281ce85e6f98a7dad0aa31a2e493a85ef178ca" resname="Design of personalization logo section" approved="yes">
        <source>Design of personalization logo section</source>
-        <target state="new">Design of personalization logo section</target>
+        <target state="translated">Design of logo customization section</target>
        <jms:reference-file line="60">Form/Configuration/GeneralFormType.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="ac930a136ebd04a19bc5f2ce1769fc065efb7bdf" resname="Detailed view URL" approved="yes">
@@ -2648,9 +2648,9 @@
        <jms:reference-file line="23">Form/Login/PhraseaForgotPasswordForm.php</jms:reference-file>
        <jms:reference-file line="37">Form/Login/PhraseaRegisterForm.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="9cf2896f8b2e9e6a28f9b151e8be31f220a5d256" resname="E-mail domain">
+      <trans-unit id="9cf2896f8b2e9e6a28f9b151e8be31f220a5d256" resname="E-mail domain" approved="yes">
        <source>E-mail domain</source>
-        <target state="new">E-mail domain</target>
+        <target state="translated">E-mail domain</target>
        <jms:reference-file line="167">actions/Feedback/list.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="734a78cd06d0929c433f487754d18bf073e43bf6" resname="EN" approved="yes">
@@ -2795,17 +2795,17 @@
        <target state="translated">E-mail test result: %email_status%</target>
        <jms:reference-file line="136">web/admin/dashboard.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="c839b2905a9c9e4e611519e461c6f3e0dde4ec78" resname="Email:deletion:request:message Hello %civility% %firstName% %lastName%.&#10;            We have received an account deletion request for your account on %urlInstance%, please confirm this deletion by clicking on the link below.&#10;            If you are not at the origin of this request, please change your password as soon as possible %resetPassword%&#10;            Link is valid for one hour.">
+      <trans-unit id="c839b2905a9c9e4e611519e461c6f3e0dde4ec78" resname="Email:deletion:request:message Hello %civility% %firstName% %lastName%.&#10;            We have received an account deletion request for your account on %urlInstance%, please confirm this deletion by clicking on the link below.&#10;            If you are not at the origin of this request, please change your password as soon as possible %resetPassword%&#10;            Link is valid for one hour." approved="yes">
        <source>Email:deletion:request:message Hello %civility% %firstName% %lastName%.
            We have received an account deletion request for your account on %urlInstance%, please confirm this deletion by clicking on the link below.
            If you are not at the origin of this request, please change your password as soon as possible %resetPassword%
            Link is valid for one hour.</source>
-        <target state="needs-translation">Hello %civility% %firstName% %lastName%. We have received an account deletion request for your account on %urlInstance%. Please confirm this deletion by clicking on the link below. If you are not at the origin of this request, please change your password as soon as possible %resetPassword%. Link is valid for one hour.</target>
+        <target state="translated">Hello %civility% %firstName% %lastName%. We have received an account deletion request for your account on %urlInstance%. Please confirm this deletion by clicking on the link below. If you are not at the origin of this request, please change your password as soon as possible %resetPassword%. Link is valid for one hour.</target>
        <jms:reference-file line="51">Notification/Mail/MailRequestAccountDelete.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="ccbd5b5d94afa34b04935d0b084335f2656d96af" resname="Email:deletion:request:subject Delete account confirmation">
+      <trans-unit id="ccbd5b5d94afa34b04935d0b084335f2656d96af" resname="Email:deletion:request:subject Delete account confirmation" approved="yes">
        <source>Email:deletion:request:subject Delete account confirmation</source>
-        <target state="needs-translation">Account deletion confirmation</target>
+        <target state="translated">Account deletion confirmation</target>
        <jms:reference-file line="39">Notification/Mail/MailRequestAccountDelete.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="b37c2cc6df6ff49078905d16da4e3fa3a28490e4" resname="Email:deletion:request:textButton Delete my account" approved="yes">
@@ -2998,9 +2998,9 @@
        <target state="translated">Succesfully delivered</target>
        <jms:reference-file line="445">Phrasea/Controller/LightboxController.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="09b6a6dcd3f6d4a7d3a95bceaad67a7f1800272f" resname="Equals">
+      <trans-unit id="09b6a6dcd3f6d4a7d3a95bceaad67a7f1800272f" resname="Equals" approved="yes">
        <source>Equals</source>
-        <target state="new">Equals</target>
+        <target state="translated">Equals</target>
        <jms:reference-file line="424">web/prod/index.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="ab546c237a6685e5c75689266cfa715eeb21b7db" resname="Erreur" approved="yes">
@@ -3141,9 +3141,9 @@
        <jms:reference-file line="13">Bridge/Dailymotion/video_deleteelement.html.twig</jms:reference-file>
        <jms:reference-file line="13">Bridge/Youtube/video_deleteelement.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="46a1884f7b083976b0fd0678f10b8f00ee93cde9" resname="Ex : Paris, bleu, montagne">
+      <trans-unit id="46a1884f7b083976b0fd0678f10b8f00ee93cde9" resname="Ex : Paris, bleu, montagne" approved="yes">
        <source>Ex : Paris, bleu, montagne</source>
-        <target state="needs-translation">Ex : Paris, blue, mountain</target>
+        <target state="translated">Ex : Paris, blue, mountain</target>
        <jms:reference-file line="426">web/prod/index.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="a9c067c65c9f9d5a8e96791db7d189bc22eca9c1" resname="Executables externes" approved="yes">
@@ -3429,9 +3429,9 @@
        <target state="translated">Creates a flexpaper flash file</target>
        <jms:reference-file line="32">Media/Subdef/FlexPaper.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="b2af9671fd7a6a61d5dd01e3c033bcade0d9695a" resname="Generates a pdf file">
+      <trans-unit id="b2af9671fd7a6a61d5dd01e3c033bcade0d9695a" resname="Generates a pdf file" approved="yes">
        <source>Generates a pdf file</source>
-        <target state="new">Generates a pdf file</target>
+        <target state="translated">Generates a pdf file</target>
        <jms:reference-file line="24">Media/Subdef/Pdf.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="d40d73fbcffe62e09f9430c0043ec2e7011a801b" resname="Generates a video file" approved="yes">
@@ -4070,9 +4070,9 @@
        <target state="translated">Light value</target>
        <jms:reference-file line="122">web/common/technical_datas.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="99f6a030c5134d53253c7442cb05c1be14229565" resname="Lightbox">
+      <trans-unit id="99f6a030c5134d53253c7442cb05c1be14229565" resname="Lightbox" approved="yes">
        <source>Lightbox</source>
-        <target state="new">Lightbox</target>
+        <target state="translated">Lightbox</target>
        <jms:reference-file line="152">prod/WorkZone/Macros.html.twig</jms:reference-file>
        <jms:reference-file line="153">prod/WorkZone/Macros.html.twig</jms:reference-file>
      </trans-unit>
@@ -4414,9 +4414,9 @@
        <target state="translated">Multivalued</target>
        <jms:reference-file line="158">admin/fields/templates.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="1b369c4651e2b82200334fa587669b3828071192" resname="My application ">
+      <trans-unit id="1b369c4651e2b82200334fa587669b3828071192" resname="My application " approved="yes">
        <source>My application </source>
-        <target state="new">My application </target>
+        <target state="translated">My application </target>
        <jms:reference-file line="266">web/account/account.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="9f36fd4dc42df8a92572afe51d887c5f33dda5b0" resname="My baskets" approved="yes">
@@ -4551,9 +4551,9 @@
        <target state="translated">No matches found</target>
        <jms:reference-file line="8">web/geonames/city_list.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="f8ff49677b7d397b0de712de733cd8bc88ef22d3" resname="No metadata available">
+      <trans-unit id="f8ff49677b7d397b0de712de733cd8bc88ef22d3" resname="No metadata available" approved="yes">
        <source>No metadata available</source>
-        <target state="new">No metadata available</target>
+        <target state="translated">No metadata available</target>
        <jms:reference-file line="43">actions/Tools/metadata.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="ee0ccefc5da5a79647ce65575ea97814db7506b7" resname="No participants specified" approved="yes">
@@ -4587,9 +4587,9 @@
        <jms:reference-file line="8">WorkZone/Browser/Results.html.twig</jms:reference-file>
        <jms:reference-file line="111">WorkZone/Browser/Results.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="bfccc7c966ca427d629149d67548af04605eb746" resname="No thesaurus concept query">
+      <trans-unit id="bfccc7c966ca427d629149d67548af04605eb746" resname="No thesaurus concept query" approved="yes">
        <source>No thesaurus concept query</source>
-        <target state="needs-translation">No thesaurus search</target>
+        <target state="translated">No thesaurus search</target>
        <jms:reference-file line="16">prod/results/infos.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="6866c8b666718aff85382e93b25ef50cd321669b" resname="No users selected" approved="yes">
@@ -4771,9 +4771,9 @@
        <target state="translated">One frame forward</target>
        <jms:reference-file line="125">Controller/Prod/LanguageController.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="c15c49205663ceff94e31db82030bb5da10df870" resname="One of these conditions">
+      <trans-unit id="c15c49205663ceff94e31db82030bb5da10df870" resname="One of these conditions" approved="yes">
        <source>One of these conditions</source>
-        <target state="new">One of these conditions</target>
+        <target state="translated">One of these conditions</target>
        <jms:reference-file line="409">web/prod/index.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="1ae26e7b698cf33577df1bd9fd55ddd1d0771802" resname="Only %nbEditableDocuments% records can be modified." approved="yes">
@@ -4791,9 +4791,9 @@
        <target state="translated">Open the URL in a new window</target>
        <jms:reference-file line="125">Core/Provider/TwigServiceProvider.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="e72184f55cc026514b7160d78c3c5aef63c2a050" resname="Or">
+      <trans-unit id="e72184f55cc026514b7160d78c3c5aef63c2a050" resname="Or" approved="yes">
        <source>Or</source>
-        <target state="new">Or</target>
+        <target state="translated">Or</target>
        <jms:reference-file line="35">prod/upload/upload.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="94946e4d2391ccf8ff24f984869ae8fcf9ede7c4" resname="Or login with" approved="yes">
@@ -4925,9 +4925,9 @@
        <target state="translated">Pause</target>
        <jms:reference-file line="124">Controller/Prod/LanguageController.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="2a78f0e9eeb4969ad86a55df617e6bb0373df78f" resname="Pays">
+      <trans-unit id="2a78f0e9eeb4969ad86a55df617e6bb0373df78f" resname="Pays" approved="yes">
        <source>Pays</source>
-        <target state="new">Pays</target>
+        <target state="translated">Country</target>
        <jms:reference-file line="32">prod/User/Add.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="3d8de900b56813bb78e97afbf22578720d473219" resname="Periodically fetches an FTP repository content locally" approved="yes">
@@ -5890,9 +5890,9 @@
        <target state="translated">Save all changes</target>
        <jms:reference-file line="8">admin/fields/templates.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="a68dd32b578cf2863f4df4362232db4d80a9557c" resname="Save the list">
+      <trans-unit id="a68dd32b578cf2863f4df4362232db4d80a9557c" resname="Save the list" approved="yes">
        <source>Save the list</source>
-        <target state="new">Save the list</target>
+        <target state="translated">Save the list</target>
        <jms:reference-file line="86">actions/Feedback/list.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="e5c05c39658269a025f4dc37b50af1bb5ab946ca" resname="Save this list" approved="yes">
@@ -5915,9 +5915,9 @@
        <target state="translated">Search engine</target>
        <jms:reference-file line="61">Form/Configuration/MainConfigurationFormType.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="a41408e4e69d88053181c88ed06a4efe5855dc4a" resname="Search for existing user">
+      <trans-unit id="a41408e4e69d88053181c88ed06a4efe5855dc4a" resname="Search for existing user" approved="yes">
        <source>Search for existing user</source>
-        <target state="new">Search for existing user</target>
+        <target state="translated">Search for existing user</target>
        <jms:reference-file line="23">actions/Feedback/List-Share.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="16c9aa8877f2b2a5067b5183327d5d35f0e8b5de" resname="SearchEngine settings" approved="yes">
@@ -5958,9 +5958,9 @@
        <target state="translated">See others' choices</target>
        <jms:reference-file line="42">prod/actions/Push.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="76f0c2c4f58a932f4d61175ea0da5799c1b3c231" resname="See the list">
+      <trans-unit id="76f0c2c4f58a932f4d61175ea0da5799c1b3c231" resname="See the list" approved="yes">
        <source>See the list</source>
-        <target state="new">See the list</target>
+        <target state="translated">View the list</target>
        <jms:reference-file line="134">actions/Feedback/list.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="7c2ce4a38c55478fb397967408b8c6d7c29fcc3b" resname="See validation results" approved="yes">
@@ -5968,9 +5968,9 @@
        <target state="translated">See feedback results.</target>
        <jms:reference-file line="81">Notification/Mail/MailInfoValidationDone.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="fd6294adde442e65458da9640beeafed76f7f66a" resname="Select a field">
+      <trans-unit id="fd6294adde442e65458da9640beeafed76f7f66a" resname="Select a field" approved="yes">
        <source>Select a field</source>
-        <target state="new">Select a field</target>
+        <target state="translated">Select a field</target>
        <jms:reference-file line="415">web/prod/index.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="68679be6d90db68ca5ceebaded92d5d83de8761c" resname="Select a list on the left and edit it !" approved="yes">
@@ -6003,9 +6003,9 @@
        <jms:reference-file line="56">admin/statusbit/edit.html.twig</jms:reference-file>
        <jms:reference-file line="121">admin/statusbit/edit.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="49fae2071d9672ce46d9fbadda409a3fa0cbc238" resname="Selected base(s)">
+      <trans-unit id="49fae2071d9672ce46d9fbadda409a3fa0cbc238" resname="Selected base(s)" approved="yes">
        <source>Selected base(s)</source>
-        <target state="needs-translation">Selected database(s) :</target>
+        <target state="translated">Selected database(s) :</target>
        <jms:reference-file line="335">web/prod/index.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="2c418c187fb3108749d7156765e7b9b16a51215f" resname="Selected files" approved="yes">
@@ -6036,9 +6036,9 @@
        <target state="translated">Send to Facebook</target>
        <jms:reference-file line="32">prod/Share/record.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="60b2d62f2951ccf92ed7fb647ee7d6ab7ecfdd5e" resname="Send to Linkedin">
+      <trans-unit id="60b2d62f2951ccf92ed7fb647ee7d6ab7ecfdd5e" resname="Send to Linkedin" approved="yes">
        <source>Send to Linkedin</source>
-        <target state="new">Send to Linkedin</target>
+        <target state="translated">Send to LinkedIn</target>
        <jms:reference-file line="37">prod/Share/record.html.twig</jms:reference-file>
        <jms:reference-file line="38">prod/Share/record.html.twig</jms:reference-file>
        <jms:reference-file line="39">prod/Share/record.html.twig</jms:reference-file>
@@ -6116,9 +6116,9 @@
        <target state="translated">Share</target>
        <jms:reference-file line="108">Controller/Prod/LanguageController.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="ce896454ee1650a73169d33b97a59cb8f90d6e6b" resname="Share my list">
+      <trans-unit id="ce896454ee1650a73169d33b97a59cb8f90d6e6b" resname="Share my list" approved="yes">
        <source>Share my list</source>
-        <target state="new">Share my list</target>
+        <target state="translated">Share my list</target>
        <jms:reference-file line="31">actions/Feedback/list.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="3d9576616347132778bc28cffe80b27a914f9dd0" resname="Share the list" approved="yes">
@@ -6854,9 +6854,9 @@
        <target state="translated">Token</target>
        <jms:reference-file line="109">web/developers/application.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="e894979930445d4b2bd8c947d6e2e6b816fcb0ab" resname="Token not found">
+      <trans-unit id="e894979930445d4b2bd8c947d6e2e6b816fcb0ab" resname="Token not found" approved="yes">
        <source>Token not found</source>
-        <target state="new">Token not found</target>
+        <target state="translated">Token not found</target>
        <jms:reference-file line="383">Controller/Root/AccountController.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="f97edaa0ce78a61e01095cae4169cada477d52dc" resname="Tool box" approved="yes">
@@ -7264,9 +7264,9 @@
        <target state="translated">Users suggestion</target>
        <jms:reference-file line="149">prod/actions/Push.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="a56fad2f92979e0171b42bbc51ff5657d17ceb91" resname="Utilisation prevue:">
+      <trans-unit id="a56fad2f92979e0171b42bbc51ff5657d17ceb91" resname="Utilisation prevue:" approved="yes">
        <source>Utilisation prevue:</source>
-        <target state="needs-translation">Intended use:</target>
+        <target state="translated">Intended use:</target>
        <jms:reference-file line="250">prod/orders/order_item.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="3b3e9155f69edf73caab337bf5f64231188b1e48" resname="VALIDATION" approved="yes">
@@ -7636,9 +7636,9 @@
        <target state="translated">Write Metadatas</target>
        <jms:reference-file line="498">web/admin/subdefs.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="d3f8f7b810c4b08f0b4ac4e47fdf8d265a10d869" resname="YYYY-MM-DD">
+      <trans-unit id="d3f8f7b810c4b08f0b4ac4e47fdf8d265a10d869" resname="YYYY-MM-DD" approved="yes">
        <source>YYYY-MM-DD</source>
-        <target state="new">YYYY-MM-DD</target>
+        <target state="translated">YYYY-MM-DD</target>
        <jms:reference-file line="10">web/report/form_date_and_base.html.twig</jms:reference-file>
        <jms:reference-file line="20">web/report/form_date_and_base.html.twig</jms:reference-file>
      </trans-unit>
@@ -7940,9 +7940,9 @@
        <target state="translated">Media and their subviews (such as previews, thumbnails...) will be stored in the following directories:</target>
        <jms:reference-file line="736">web/setup/step2.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="bd5a589e9bed2de0b0180ca950ea0593249f7f69" resname="Your phraseanet account on %urlInstance% has been deleted!">
+      <trans-unit id="bd5a589e9bed2de0b0180ca950ea0593249f7f69" resname="Your phraseanet account on %urlInstance% has been deleted!" approved="yes">
        <source>Your phraseanet account on %urlInstance% has been deleted!</source>
-        <target state="new">Your phraseanet account on %urlInstance% has been deleted!</target>
+        <target state="translated">Your phraseanet account on %urlInstance% has been deleted!</target>
        <jms:reference-file line="29">Notification/Mail/MailSuccessAccountDelete.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="257253d658fdcbe73c4f4d02d2a3442ea8e4011d" resname="Your registration requests have been taken into account." approved="yes">
@@ -8908,29 +8908,29 @@
        <target state="translated">Aggregates settings</target>
        <jms:reference-file line="5">admin/search-engine/search-engine-settings.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="08772ff0da8ce970d5fac07a7afb6f855401d235" resname="admin::setup:personalisation_logo: download gabari">
+      <trans-unit id="08772ff0da8ce970d5fac07a7afb6f855401d235" resname="admin::setup:personalisation_logo: download gabari" approved="yes">
        <source>admin::setup:personalisation_logo: download gabari</source>
-        <target state="new">admin::setup:personalisation_logo: download gabari</target>
+        <target state="translated">Download template</target>
        <jms:reference-file line="18">web/admin/personalisation_logo.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="a051f8357ca68bd96210d071cdfacfe8a54de2af" resname="admin::setup:personalisation_logo: error text dimension">
+      <trans-unit id="a051f8357ca68bd96210d071cdfacfe8a54de2af" resname="admin::setup:personalisation_logo: error text dimension" approved="yes">
        <source>admin::setup:personalisation_logo: error text dimension</source>
-        <target state="new">admin::setup:personalisation_logo: error text dimension</target>
+        <target state="translated">Error: the size of the file is incorrect, please choose a file size: 120 x 41 px in .png</target>
        <jms:reference-file line="44">web/admin/personalisation_logo.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="4499d392aa84b8bf806252937b820281034ffd0c" resname="admin::setup:personalisation_logo: error text file type">
+      <trans-unit id="4499d392aa84b8bf806252937b820281034ffd0c" resname="admin::setup:personalisation_logo: error text file type" approved="yes">
        <source>admin::setup:personalisation_logo: error text file type</source>
-        <target state="new">admin::setup:personalisation_logo: error text file type</target>
+        <target state="translated">Error: the format of the file is incorrect, please choose a file in .png</target>
        <jms:reference-file line="45">web/admin/personalisation_logo.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="78a276b502761ddad6d621bf315ed17362b12748" resname="admin::setup:personalisation_logo: help text">
+      <trans-unit id="78a276b502761ddad6d621bf315ed17362b12748" resname="admin::setup:personalisation_logo: help text" approved="yes">
        <source>admin::setup:personalisation_logo: help text</source>
-        <target state="new">admin::setup:personalisation_logo: help text</target>
+        <target state="translated">Import your logo at the maximum file size: 120 x 41 px in .png</target>
        <jms:reference-file line="16">web/admin/personalisation_logo.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="1ae037eda66d81b87705cdbdc04e4d8c0a953755" resname="admin::setup:personalisation_logo: select file">
+      <trans-unit id="1ae037eda66d81b87705cdbdc04e4d8c0a953755" resname="admin::setup:personalisation_logo: select file" approved="yes">
        <source>admin::setup:personalisation_logo: select file</source>
-        <target state="new">admin::setup:personalisation_logo: select file</target>
+        <target state="translated">Choose a file</target>
        <jms:reference-file line="31">web/admin/personalisation_logo.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="8fb48b51ad1962dc1b6a3643964f38fc48853161" resname="admin::status: case A" approved="yes">
@@ -9646,9 +9646,9 @@
        <target state="translated">Subview Name</target>
        <jms:reference-file line="354">web/admin/subdefs.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="670f6628c7b72287a36ecd01262005e81428451c" resname="created_on">
+      <trans-unit id="670f6628c7b72287a36ecd01262005e81428451c" resname="created_on" approved="yes">
        <source>created_on</source>
-        <target state="new">created_on</target>
+        <target state="translated">created on</target>
        <jms:reference-file line="466">web/prod/index.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="fc97186645dc71dae8e3221c8ce53c56e6d611bf" resname="dans %category%" approved="yes">
@@ -9667,9 +9667,9 @@
        <target state="translated">Add date</target>
        <jms:reference-file line="141">SearchEngine/Elastic/ElasticSearchEngine.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="9422f3c3d1d722ee14182539cce3e00c003efd63" resname="date de modification">
+      <trans-unit id="9422f3c3d1d722ee14182539cce3e00c003efd63" resname="date de modification" approved="yes">
        <source>date de modification</source>
-        <target state="new">date de modification</target>
+        <target state="translated">Modification date</target>
        <jms:reference-file line="142">SearchEngine/Elastic/ElasticSearchEngine.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="41c882ad92672dcb86f0ede3f789f7542bcc82fc" resname="decembre" approved="yes">
@@ -9797,9 +9797,9 @@
        <jms:reference-file line="103">web/common/dialog_export.html.twig</jms:reference-file>
        <jms:reference-file line="116">web/common/dialog_export.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="fcf5093722566a47fe3e773296cc63fac7190dac" resname="export::export-email: email-invalid">
+      <trans-unit id="fcf5093722566a47fe3e773296cc63fac7190dac" resname="export::export-email: email-invalid" approved="yes">
        <source>export::export-email: email-invalid</source>
-        <target state="needs-translation">The email address format seems incorrect</target>
+        <target state="translated">The email address format seems incorrect</target>
        <jms:reference-file line="510">web/common/dialog_export.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="40a92233bac9303de825031d1954e6b109088b38" resname="export::ftp: reglages manuels" approved="yes">
@@ -10003,19 +10003,19 @@ See documentation for more examples https://docs.phraseanet.com</target>
        <target state="translated">Facets Preferences</target>
        <jms:reference-file line="803">web/prod/index.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="2f830d57f4cedb2a49c7b109f9b91b0f8ba83e8b" resname="index::advance_search: facet-order">
+      <trans-unit id="2f830d57f4cedb2a49c7b109f9b91b0f8ba83e8b" resname="index::advance_search: facet-order" approved="yes">
        <source>index::advance_search: facet-order</source>
-        <target state="needs-translation">Facets order</target>
+        <target state="translated">Facets order</target>
        <jms:reference-file line="804">web/prod/index.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="5a25478cdd7fe21258071c4f3a5d9920225f9356" resname="index::advance_search: facet-tech-order">
+      <trans-unit id="5a25478cdd7fe21258071c4f3a5d9920225f9356" resname="index::advance_search: facet-tech-order" approved="yes">
        <source>index::advance_search: facet-tech-order</source>
-        <target state="needs-translation">default order</target>
+        <target state="translated">Default order</target>
        <jms:reference-file line="810">web/prod/index.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="6b9516a3c46d7ad246a9fbb3df693ba6c783c986" resname="index::advance_search: facet-values-order">
+      <trans-unit id="6b9516a3c46d7ad246a9fbb3df693ba6c783c986" resname="index::advance_search: facet-values-order" approved="yes">
        <source>index::advance_search: facet-values-order</source>
-        <target state="needs-translation">facets value order</target>
+        <target state="translated">Facets values order</target>
        <jms:reference-file line="816">web/prod/index.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="dfb02fcdeb804315cd6ad8388efcfb4ccc4abf38" resname="index::advance_search: hidden-facet-values-order" approved="yes">
@@ -10023,9 +10023,9 @@ See documentation for more examples https://docs.phraseanet.com</target>
        <target state="translated">Hidden Facets</target>
        <jms:reference-file line="833">web/prod/index.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="4a35cc75d1072f7dad99c8e91596298f55f20a54" resname="index::advance_search: order-by-hits">
+      <trans-unit id="4a35cc75d1072f7dad99c8e91596298f55f20a54" resname="index::advance_search: order-by-hits" approved="yes">
        <source>index::advance_search: order-by-hits</source>
-        <target state="new">index::advance_search: order-by-hits</target>
+        <target state="translated">Order by hits</target>
        <jms:reference-file line="822">web/prod/index.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="1039a002699408da4c4fe74638a6b44f60499069" resname="index:advanced-preferences:: use truncation" approved="yes">
@@ -10506,9 +10506,9 @@ See documentation for more examples https://docs.phraseanet.com</target>
        <jms:reference-file line="117">prod/orders/order_box.html.twig</jms:reference-file>
        <jms:reference-file line="168">prod/orders/order_box.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="0259e4e17a1f2697d4f4f0108080276a5d7573de" resname="original logo">
+      <trans-unit id="0259e4e17a1f2697d4f4f0108080276a5d7573de" resname="original logo" approved="yes">
        <source>original logo</source>
-        <target state="new">original logo</target>
+        <target state="translated">Original logo</target>
        <jms:reference-file line="23">Form/Configuration/PersonalisationLogoFormType.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="5898fc860300e228dcd54c0b1045b5fa0dcda502" resname="oui" approved="yes">
@@ -10599,9 +10599,9 @@ See documentation for more examples https://docs.phraseanet.com</target>
        <target state="translated">per month</target>
        <jms:reference-file line="62">web/admin/editusers_quotas.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="ead5a6379197deb9163d2101354822e6caaa30eb" resname="personalize logo">
+      <trans-unit id="ead5a6379197deb9163d2101354822e6caaa30eb" resname="personalize logo" approved="yes">
        <source>personalize logo</source>
-        <target state="new">personalize logo</target>
+        <target state="translated">Customize logo</target>
        <jms:reference-file line="24">Form/Configuration/PersonalisationLogoFormType.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="f16110620b1971f58336063cbdb64df7e0e0c7ac" resname="pertinence" approved="yes">
@@ -10634,9 +10634,9 @@ See documentation for more examples https://docs.phraseanet.com</target>
        <target state="translated">Mount Database from a distant host.</target>
        <jms:reference-file line="103">web/admin/databases.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="6cb5c0796bbc3bf1d892ba5be804a7e53595ea1d" resname="phraseanet:: Preferences">
+      <trans-unit id="6cb5c0796bbc3bf1d892ba5be804a7e53595ea1d" resname="phraseanet:: Preferences" approved="yes">
        <source>phraseanet:: Preferences</source>
-        <target state="new">phraseanet:: Preferences</target>
+        <target state="translated">Preferences</target>
        <jms:reference-file line="255">web/prod/index.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="2751058550fb9a63ba3ffa07152ec68f594dec2a" resname="phraseanet:: Un email vient de vous etre envoye" approved="yes">
@@ -10809,34 +10809,34 @@ See documentation for more examples https://docs.phraseanet.com</target>
        <target state="translated">The account has been deleted</target>
        <jms:reference-file line="544">Controller/Root/AccountController.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="bf7028b694aea3fc9ede5014a9f8b5d617b83b6f" resname="phraseanet::account: &lt;&lt; your account can be deleted via admin interface &gt;&gt; ">
+      <trans-unit id="bf7028b694aea3fc9ede5014a9f8b5d617b83b6f" resname="phraseanet::account: &lt;&lt; your account can be deleted via admin interface &gt;&gt; " approved="yes">
        <source><![CDATA[phraseanet::account: << your account can be deleted via admin interface >> ]]></source>
-        <target state="needs-translation">Your rights do not allow to perform this action. Your account can only be deleted via the Administration interface.</target>
+        <target state="translated">Your rights do not allow to perform this action. Your account can only be deleted via the Administration interface.</target>
        <jms:reference-file line="296">web/account/account.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="047b7994f5960aae108105ad5deadb5bbd72c8fc" resname="phraseanet::account: A confirmation e-mail has been sent. Please follow the instructions contained to continue account deletion">
+      <trans-unit id="047b7994f5960aae108105ad5deadb5bbd72c8fc" resname="phraseanet::account: A confirmation e-mail has been sent. Please follow the instructions contained to continue account deletion" approved="yes">
        <source>phraseanet::account: A confirmation e-mail has been sent. Please follow the instructions contained to continue account deletion</source>
-        <target state="needs-translation">A confirmation email has been sent. Please follow the instructions to delete the account.</target>
+        <target state="translated">A confirmation email has been sent. Please follow the instructions to delete the account.</target>
        <jms:reference-file line="360">Controller/Root/AccountController.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="d0ee9e2c90a05b113b00bf7accd590557bd78528" resname="phraseanet::account: Are you sure you want to delete your account?">
+      <trans-unit id="d0ee9e2c90a05b113b00bf7accd590557bd78528" resname="phraseanet::account: Are you sure you want to delete your account?" approved="yes">
        <source>phraseanet::account: Are you sure you want to delete your account?</source>
-        <target state="needs-translation">Are you sure you wish to delete your account?</target>
+        <target state="translated">Are you sure you wish to delete your account?</target>
        <jms:reference-file line="253">web/account/account.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="b98be91d0f8cadb22e52e6217584b7a11370fbb6" resname="phraseanet::account: Delete my account">
+      <trans-unit id="b98be91d0f8cadb22e52e6217584b7a11370fbb6" resname="phraseanet::account: Delete my account" approved="yes">
        <source>phraseanet::account: Delete my account</source>
-        <target state="needs-translation">Delete my account</target>
+        <target state="translated">Delete my account</target>
        <jms:reference-file line="244">web/account/account.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="b7993903466c49139bfae4c34c63446ff24b1474" resname="phraseanet::account: I am agree to delete my account">
+      <trans-unit id="b7993903466c49139bfae4c34c63446ff24b1474" resname="phraseanet::account: I am agree to delete my account" approved="yes">
        <source>phraseanet::account: I am agree to delete my account</source>
-        <target state="needs-translation">I agree to delete my account</target>
+        <target state="translated">I agree to delete my account</target>
        <jms:reference-file line="285">web/account/account.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="1b836fda2a5c65abfd05c215d4c4dd66361e4f0f" resname="phraseanet::account: I am agree to delete my account, need confirmation on mail">
+      <trans-unit id="1b836fda2a5c65abfd05c215d4c4dd66361e4f0f" resname="phraseanet::account: I am agree to delete my account, need confirmation on mail" approved="yes">
        <source>phraseanet::account: I am agree to delete my account, need confirmation on mail</source>
-        <target state="needs-translation">I agree to delete my account and I need a confirmation by email</target>
+        <target state="translated">I agree to delete my account and I need a confirmation by email</target>
        <jms:reference-file line="283">web/account/account.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="121aa945bfcb3565989acc06a1ccda5b36be6bf0" resname="phraseanet::account: List of data to be deleted" approved="yes">
@@ -10844,9 +10844,9 @@ See documentation for more examples https://docs.phraseanet.com</target>
        <target state="translated">List of data to be deleted</target>
        <jms:reference-file line="254">web/account/account.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="8d168955d9cfb26df27fbdcb4f83bbfe78654703" resname="phraseanet::account: My phraseanet account">
+      <trans-unit id="8d168955d9cfb26df27fbdcb4f83bbfe78654703" resname="phraseanet::account: My phraseanet account" approved="yes">
        <source>phraseanet::account: My phraseanet account</source>
-        <target state="needs-translation">My Phraseanet account</target>
+        <target state="translated">My Phraseanet account</target>
        <jms:reference-file line="274">web/account/account.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="9628f29074afd5c9bb42bb0b4c896f8bc32c192e" resname="phraseanet::chargement" approved="yes">
@@ -11148,9 +11148,9 @@ See documentation for more examples https://docs.phraseanet.com</target>
        <target state="translated">You do not have the required permissions on selected documents</target>
        <jms:reference-file line="35">Controller/Prod/MoveCollectionController.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="ef27ad74061e0e15683e84dec7f5559f7797637f" resname="prod::advancesearch:tooltips:datefield_restriction_explanation">
+      <trans-unit id="ef27ad74061e0e15683e84dec7f5559f7797637f" resname="prod::advancesearch:tooltips:datefield_restriction_explanation" approved="yes">
        <source>prod::advancesearch:tooltips:datefield_restriction_explanation</source>
-        <target state="needs-translation">Narrow the search results to dates</target>
+        <target state="translated">Narrow the search results to dates</target>
        <jms:reference-file line="453">web/prod/index.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="fa55093d5fb1dfe235a46f8b4fecad5d36d3f250" resname="prod::advancesearch:tooltips:field_restriction_explanation">
@@ -11419,9 +11419,9 @@ See documentation for more examples https://docs.phraseanet.com</target>
        <jms:reference-file line="70">Controller/Prod/ToolsController.php</jms:reference-file>
        <jms:reference-file line="41">Controller/Prod/ShareController.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="501adfe6ea4c900a76df9f3c1d55834e6db5b9a9" resname="prod:app trash: also-move-record">
+      <trans-unit id="501adfe6ea4c900a76df9f3c1d55834e6db5b9a9" resname="prod:app trash: also-move-record" approved="yes">
        <source>prod:app trash: also-move-record</source>
-        <target state="needs-translation">Also move to Trash the records that rely on stories</target>
+        <target state="translated">Also move to Trash the records that rely on stories</target>
        <jms:reference-file line="28">prod/actions/delete_records_confirm.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="9dd9daa2dc851f005bbcb2ce0ea0c8de6b86ad52" resname="prod:app trash: record-delete">
@@ -11454,9 +11454,9 @@ See documentation for more examples https://docs.phraseanet.com</target>
        <target state="needs-translation">Only a media of type video can be edited</target>
        <jms:reference-file line="149">Controller/Prod/LanguageController.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="d2e761bd6f1cd95c2ea787f5eb206f6457c20d4b" resname="prod:edit: suggested_values">
+      <trans-unit id="d2e761bd6f1cd95c2ea787f5eb206f6457c20d4b" resname="prod:edit: suggested_values" approved="yes">
        <source>prod:edit: suggested_values</source>
-        <target state="needs-translation">Suggested values</target>
+        <target state="translated">Suggested values</target>
        <jms:reference-file line="152">Controller/Prod/LanguageController.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="253244f8f2642b58bb079abe2088b2461a3dd7b1" resname="prod:edit: video-editor">
@@ -11684,25 +11684,25 @@ It is possible to place several search areas</target>
        <target state="translated">Time Range</target>
        <jms:reference-file line="3">web/report/form_date_and_base.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="87cb22fb5598f714cf44b13ef0d2fcfa0fe1e01a" resname="report:: 2 - Base">
+      <trans-unit id="87cb22fb5598f714cf44b13ef0d2fcfa0fe1e01a" resname="report:: 2 - Base" approved="yes">
        <source>report:: 2 - Base</source>
-        <target state="new">report:: 2 - Base</target>
+        <target state="translated">Database</target>
        <jms:reference-file line="26">web/report/form_date_and_base.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="49e279e2253aaf0d8aebad389584f5c7c77e5a78" resname="report:: 3 - Collections">
+      <trans-unit id="49e279e2253aaf0d8aebad389584f5c7c77e5a78" resname="report:: 3 - Collections" approved="yes">
        <source>report:: 3 - Collections</source>
-        <target state="new">report:: 3 - Collections</target>
+        <target state="translated">Collections</target>
        <jms:reference-file line="39">web/report/form_date_and_base.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="a807c0ef7e32813081616c65bbc134acdf30666b" resname="report:: 3 - Type de report">
+      <trans-unit id="a807c0ef7e32813081616c65bbc134acdf30666b" resname="report:: 3 - Type de report" approved="yes">
        <source>report:: 3 - Type de report</source>
-        <target state="needs-translation">Type of report</target>
+        <target state="translated">Type of report</target>
        <jms:reference-file line="11">web/report/report_layout_child.html.twig</jms:reference-file>
        <jms:reference-file line="36">web/report/report_layout_child.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="bbf54f30e0791db4dc06243d939468640ddb6cc5" resname="report:: 4 - Fields">
+      <trans-unit id="bbf54f30e0791db4dc06243d939468640ddb6cc5" resname="report:: 4 - Fields" approved="yes">
        <source>report:: 4 - Fields</source>
-        <target state="new">report:: 4 - Fields</target>
+        <target state="translated">Fields</target>
        <jms:reference-file line="62">web/report/report_layout_child.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="67272ff4fb66e47f6a5e55c7171e994c69b6f162" resname="report:: Au (date)" approved="yes">
@@ -11717,9 +11717,9 @@ It is possible to place several search areas</target>
        <jms:reference-file line="9">web/report/report_layout.html.twig</jms:reference-file>
        <jms:reference-file line="25">web/report/all_content.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="afa9685c95f7dff29cb2ad048da368c6e3dbadbc" resname="report:: Databox content">
+      <trans-unit id="afa9685c95f7dff29cb2ad048da368c6e3dbadbc" resname="report:: Databox content" approved="yes">
        <source>report:: Databox content</source>
-        <target state="new">report:: Databox content</target>
+        <target state="translated">Databox content</target>
        <jms:reference-file line="11">web/report/report_layout.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="afa00f7f0e9cf982c242e1a53235360b4aac707d" resname="report:: Detail des connexions" approved="yes">
@@ -11767,9 +11767,9 @@ It is possible to place several search areas</target>
        <target state="translated">Users information corresponding to %critere%</target>
        <jms:reference-file line="415">module/report/nav.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="d61b0b1a419a5b37db8576e1072307a5503dba79" resname="report:: Phraseanet report">
+      <trans-unit id="d61b0b1a419a5b37db8576e1072307a5503dba79" resname="report:: Phraseanet report" approved="yes">
        <source>report:: Phraseanet report</source>
-        <target state="new">report:: Phraseanet report</target>
+        <target state="translated">Phraseanet report</target>
        <jms:reference-file line="6">web/report/report_layout.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="a5c2d01ec9cd2716cb44a02ba1851d82de40aa8a" resname="report:: Plateforme" approved="yes">
@@ -12211,9 +12211,9 @@ It is possible to place several search areas</target>
        <target state="needs-translation">Add link</target>
        <jms:reference-file line="78">web/admin/setup.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="44a5de1cdcf30547c937f197cd3d58e143de62a6" resname="setup::custom-link:help-menu">
+      <trans-unit id="44a5de1cdcf30547c937f197cd3d58e143de62a6" resname="setup::custom-link:help-menu" approved="yes">
        <source>setup::custom-link:help-menu</source>
-        <target state="needs-translation">Help Menu</target>
+        <target state="translated">Help Menu</target>
        <jms:reference-file line="58">Form/Configuration/CustomLinkFormType.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="0286ea45f1074802cfe8fbf84b7c439fb287d0de" resname="setup::custom-link:language-link" approved="yes">
@@ -12231,9 +12231,9 @@ It is possible to place several search areas</target>
        <target state="new">setup::custom-link:location</target>
        <jms:reference-file line="57">Form/Configuration/CustomLinkFormType.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="f4db79dfecabb4b9acb44a4b49e9b6b433b28d04" resname="setup::custom-link:location-link">
+      <trans-unit id="f4db79dfecabb4b9acb44a4b49e9b6b433b28d04" resname="setup::custom-link:location-link" approved="yes">
        <source>setup::custom-link:location-link</source>
-        <target state="needs-translation">Placement</target>
+        <target state="translated">Placement</target>
        <jms:reference-file line="100">web/admin/setup.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="ccfe45428ee9769a865d3d90c0e4dc50a6b68e9c" resname="setup::custom-link:name-link">
@@ -12247,9 +12247,9 @@ It is possible to place several search areas</target>
        <target state="needs-translation">Navigation Bar</target>
        <jms:reference-file line="59">Form/Configuration/CustomLinkFormType.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="4696021003b181f9acc9261382e07364c6b83036" resname="setup::custom-link:order-link">
+      <trans-unit id="4696021003b181f9acc9261382e07364c6b83036" resname="setup::custom-link:order-link" approved="yes">
        <source>setup::custom-link:order-link</source>
-        <target state="needs-translation">Display order</target>
+        <target state="translated">Display order</target>
        <jms:reference-file line="101">web/admin/setup.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="1b09a3a0a8b0205f23b3fe59074f8dfd72d0b0ae" resname="setup::custom-link:placeholder-link-url">
@@ -12272,9 +12272,9 @@ It is possible to place several search areas</target>
        <target state="translated">Advanced setting</target>
        <jms:reference-file line="9">prod/Share/record.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="f51d8ca24dc67572beccf115c79671ba1c3f545a" resname="share::share-record: select-shared-def">
+      <trans-unit id="f51d8ca24dc67572beccf115c79671ba1c3f545a" resname="share::share-record: select-shared-def" approved="yes">
        <source>share::share-record: select-shared-def</source>
-        <target state="needs-translation">Select a subview to share</target>
+        <target state="translated">Select a subview to share</target>
        <jms:reference-file line="11">prod/Share/record.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="98693e37d002821e032bfc91ffc5091c3b6d76da" resname="status:: Affichable pour tous" approved="yes">
@@ -13053,9 +13053,9 @@ It is possible to place several search areas</target>
        <target state="translated">Your version is up to date</target>
        <jms:reference-file line="53">web/admin/databases.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="cde2aa1e33b0a816e8539ae4669b9575a8c83762" resname="updated_on">
+      <trans-unit id="cde2aa1e33b0a816e8539ae4669b9575a8c83762" resname="updated_on" approved="yes">
        <source>updated_on</source>
-        <target state="new">updated_on</target>
+        <target state="translated">updated on</target>
        <jms:reference-file line="465">web/prod/index.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="bc34ae0ecd7020a2f3f57afaf84d3fea6c3e9c0f" resname="upload:: Destination (collection) :" approved="yes">
--- a/resources/locales/messages.fr.xlf
+++ b/resources/locales/messages.fr.xlf
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='utf-8'?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
  <file date="2019-05-21T05:55:28Z" source-language="en" target-language="fr" datatype="plaintext" original="not.available">
    <header>
@@ -7,14 +7,14 @@
    </header>
    <body>
      <trans-unit id="da39a3ee5e6b4b0d3255bfef95601890afd80709" resname="">
-        <source></source>
-        <target state="new"></target>
+        <source/>
+        <target state="new"/>
        <jms:reference-file line="60">Form/Login/PhraseaAuthenticationForm.php</jms:reference-file>
        <jms:reference-file line="47">Form/Configuration/EmailFormType.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="c03e9a1b443b7d9ac9a84e4d2cf55ebc016a9c5b" resname="                                Add">
+      <trans-unit id="c03e9a1b443b7d9ac9a84e4d2cf55ebc016a9c5b" resname="                                Add" approved="yes">
        <source>                                Add</source>
-        <target state="needs-translation">Ajouter</target>
+        <target state="translated">Ajouter</target>
        <jms:reference-file line="66">admin/fields/templates.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="955ba3f1b3cb9a2d319b73af341dd94392f61e87" resname="                    The parameter &quot;force authentication&quot; forces the recipient(s) of the push to possess a Phraseanet account&#10;                    to see its contents.&#10;                    This avoids anonymous users to access to the content of the push if they were able to get the display&#10;                    url through a forwarded mail for example.&#10;                " approved="yes">
@@ -579,7 +579,7 @@
      </trans-unit>
      <trans-unit id="322d1ea01506ec9e0344d8cd25dd10808d427343" resname="Access to the above bases constitutes acceptance of the following Terms of Use (TOU)." approved="yes">
        <source>Access to the above bases constitutes acceptance of the following Terms of Use (TOU).</source>
-        <target state="translated">L'accès aux ressources de cette base implique l'acceptation des Conditions Générales d'Utilisation suivantes:</target>
+        <target state="translated">L'accès aux ressources de cette base implique l'acceptation des Conditions générales d'utilisation suivantes :</target>
        <jms:reference-file line="19">web/account/access.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="9db7fb32c517586a4123d511613b492d910aecaa" resname="Access user have readonly access" approved="yes">
@@ -662,9 +662,9 @@
        <target state="translated">Activer la collection</target>
        <jms:reference-file line="184">admin/databox/databox.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="81c0d915fa6d82fd30661c5e66e204cea52bb2b5" resname="Activity">
+      <trans-unit id="81c0d915fa6d82fd30661c5e66e204cea52bb2b5" resname="Activity" approved="yes">
        <source>Activity</source>
-        <target state="new">Activity</target>
+        <target state="translated">Activité</target>
        <jms:reference-file line="170">actions/Feedback/list.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="61cc55aa0453184734c3fa0b621eda6fa874bd83" resname="Add" approved="yes">
@@ -716,9 +716,9 @@
        <target state="needs-translation">Nouveaux Chapitre</target>
        <jms:reference-file line="138">Controller/Prod/LanguageController.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="1b27740ce4d6bea2dd21cee1c12fa73206c1444a" resname="Add this url">
+      <trans-unit id="1b27740ce4d6bea2dd21cee1c12fa73206c1444a" resname="Add this url" approved="yes">
        <source>Add this url</source>
-        <target state="new">Add this url</target>
+        <target state="translated">Ajouter cette URL</target>
        <jms:reference-file line="36">prod/upload/upload.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="f347a8ddd22508ed0310a2f9d8cf43dd96be34b1" resname="Add user" approved="yes">
@@ -2461,9 +2461,9 @@
        <jms:reference-file line="71">web/report/report_layout_child.html.twig</jms:reference-file>
        <jms:reference-file line="48">web/report/form_date_and_base.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="fd281ce85e6f98a7dad0aa31a2e493a85ef178ca" resname="Design of personalization logo section">
+      <trans-unit id="fd281ce85e6f98a7dad0aa31a2e493a85ef178ca" resname="Design of personalization logo section" approved="no">
        <source>Design of personalization logo section</source>
-        <target state="new">Design of personalization logo section</target>
+        <target state="needs-translation">Design de la section de personnalisation du logo</target>
        <jms:reference-file line="60">Form/Configuration/GeneralFormType.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="ac930a136ebd04a19bc5f2ce1769fc065efb7bdf" resname="Detailed view URL" approved="yes">
@@ -2614,9 +2614,9 @@
        <target state="translated">Téléchargement de documents</target>
        <jms:reference-file line="13">actions/Download/prepare.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="7cec77b277c557a0d7c6f62b73691b0079b37639" resname="Drag and drop the pin to move position">
+      <trans-unit id="7cec77b277c557a0d7c6f62b73691b0079b37639" resname="Drag and drop the pin to move position" approved="yes">
        <source>Drag and drop the pin to move position</source>
-        <target state="needs-translation">Glissé déposé l'icon pour modifier la position.</target>
+        <target state="translated">Glisser-déposer l'icône pour modifier la position</target>
        <jms:reference-file line="118">Controller/Prod/LanguageController.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="8e9069dbb48837c11e9c74fe440ccfd5d1cd6b0b" resname="Droits" approved="yes">
@@ -2645,14 +2645,14 @@
        <jms:reference-file line="23">Form/Login/PhraseaForgotPasswordForm.php</jms:reference-file>
        <jms:reference-file line="37">Form/Login/PhraseaRegisterForm.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="9cf2896f8b2e9e6a28f9b151e8be31f220a5d256" resname="E-mail domain">
+      <trans-unit id="9cf2896f8b2e9e6a28f9b151e8be31f220a5d256" resname="E-mail domain" approved="yes">
        <source>E-mail domain</source>
-        <target state="new">E-mail domain</target>
+        <target state="translated">Domaine email</target>
        <jms:reference-file line="167">actions/Feedback/list.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="734a78cd06d0929c433f487754d18bf073e43bf6" resname="EN">
+      <trans-unit id="734a78cd06d0929c433f487754d18bf073e43bf6" resname="EN" approved="yes">
        <source>EN</source>
-        <target state="new">EN</target>
+        <target state="translated">EN</target>
        <jms:reference-file line="37">Form/Configuration/CustomLinkFormType.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="a908567d2c0292366061394efd6d40b139e033c5" resname="ERREUR : La classe de subdef est necessaire et egal a &quot;thumbnail&quot;,&quot;preview&quot; ou &quot;document&quot;" approved="yes">
@@ -2670,9 +2670,9 @@
        <target state="translated">ERREUR : Toutes les balises "subdefgroup" nécessitent un attribut "name"</target>
        <jms:reference-file line="213">lib/classes/databox.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="9debabbaa01a190fabe8324c5e6e2f2808052099" resname="ES">
+      <trans-unit id="9debabbaa01a190fabe8324c5e6e2f2808052099" resname="ES" approved="yes">
        <source>ES</source>
-        <target state="new">ES</target>
+        <target state="translated">ES</target>
        <jms:reference-file line="38">Form/Configuration/CustomLinkFormType.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="5301648dcf6b53cefc9ed52999aaa92d4603cae0" resname="Edit" approved="yes">
@@ -2680,9 +2680,9 @@
        <target state="translated">Editer</target>
        <jms:reference-file line="10">admin/task-manager/templates.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="c989a5c3729db7aa928f90f4d56e107adbee954c" resname="Edit position">
+      <trans-unit id="c989a5c3729db7aa928f90f4d56e107adbee954c" resname="Edit position" approved="yes">
        <source>Edit position</source>
-        <target state="needs-translation">Modifier la position</target>
+        <target state="translated">Modifier la position</target>
        <jms:reference-file line="116">Controller/Prod/LanguageController.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="9d70cb368bda9b31e0c6894792a9ee58865d01d4" resname="Editer" approved="yes">
@@ -3170,9 +3170,9 @@
        <target state="translated">Export ajouté dans la file d'attente.</target>
        <jms:reference-file line="136">Controller/Prod/ExportController.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="6d2830b1e76dc7300fce6745176601827d233de8" resname="FR">
+      <trans-unit id="6d2830b1e76dc7300fce6745176601827d233de8" resname="FR" approved="yes">
        <source>FR</source>
-        <target state="new">FR</target>
+        <target state="translated">FR</target>
        <jms:reference-file line="36">Form/Configuration/CustomLinkFormType.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="acb28212fba0272ee990cebd571ebe09b463312e" resname="FTP" approved="yes">
@@ -3452,9 +3452,9 @@
        <jms:reference-file line="47">Media/Subdef/Image.php</jms:reference-file>
        <jms:reference-file line="47">Media/Subdef/Unknown.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="621654fc14cd9c0d5f5009ff29c1ba0db747f162" resname="Geo Search">
+      <trans-unit id="621654fc14cd9c0d5f5009ff29c1ba0db747f162" resname="Geo Search" approved="yes">
        <source>Geo Search</source>
-        <target state="needs-translation">Recherche géolocalisé</target>
+        <target state="translated">Recherche géolocalisée</target>
        <jms:reference-file line="286">web/prod/index.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="efd1f5fd46c31701d2e70555e9ab45efe27b4048" resname="Geonames server address" approved="yes">
@@ -3615,9 +3615,9 @@
        <target state="translated">Adresse IP</target>
        <jms:reference-file line="28">web/account/sessions.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="4f325d995b6d028ccc75771b1679537b623521c4" resname="ISO">
+      <trans-unit id="4f325d995b6d028ccc75771b1679537b623521c4" resname="ISO" approved="yes">
        <source>ISO</source>
-        <target state="new">ISO</target>
+        <target state="translated">ISO</target>
        <jms:reference-file line="288">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="16a5173a6d384d155354f429d72834cd0bd6bc54" resname="ISO sensibility" approved="yes">
@@ -3843,9 +3843,9 @@
        <target state="translated">Conserver la synchronisation entre Bridge et les API clientes.</target>
        <jms:reference-file line="41">TaskManager/Job/BridgeJob.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="266695479a949eec44dea9db4e15fba00163f04e" resname="Keyboard shortcuts">
+      <trans-unit id="266695479a949eec44dea9db4e15fba00163f04e" resname="Keyboard shortcuts" approved="yes">
        <source>Keyboard shortcuts</source>
-        <target state="needs-translation">Raccourcis claviers</target>
+        <target state="translated">Raccourcis claviers</target>
        <jms:reference-file line="121">Controller/Prod/LanguageController.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="aa288d5bdc9be4c044885fa43c6f3758a1087d5a" resname="Keywords used for indexing purposes by search engines robots" approved="yes">
@@ -3920,9 +3920,9 @@
        <jms:reference-file line="38">admin/statusbit/edit.html.twig</jms:reference-file>
        <jms:reference-file line="103">admin/statusbit/edit.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="89b86ab0e66f527166d98df92ddbcf5416ed58f6" resname="Language">
+      <trans-unit id="89b86ab0e66f527166d98df92ddbcf5416ed58f6" resname="Language" approved="yes">
        <source>Language</source>
-        <target state="needs-translation">Langue</target>
+        <target state="translated">Langue</target>
        <jms:reference-file line="674">web/prod/index.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="863cb39fbe7d70597076af1960b7ae4618d9e1bc" resname="Last Name" approved="yes">
@@ -4067,9 +4067,9 @@
        <target state="translated">Luminance</target>
        <jms:reference-file line="122">web/common/technical_datas.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="99f6a030c5134d53253c7442cb05c1be14229565" resname="Lightbox">
+      <trans-unit id="99f6a030c5134d53253c7442cb05c1be14229565" resname="Lightbox" approved="yes">
        <source>Lightbox</source>
-        <target state="new">Lightbox</target>
+        <target state="translated">Lightbox</target>
        <jms:reference-file line="152">prod/WorkZone/Macros.html.twig</jms:reference-file>
        <jms:reference-file line="153">prod/WorkZone/Macros.html.twig</jms:reference-file>
      </trans-unit>
@@ -4293,9 +4293,9 @@
        <target state="translated">Type Mime</target>
        <jms:reference-file line="14">web/common/technical_datas.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="1bd7ccbde8d3077fec1f549017e747393223a900" resname="MimeType">
+      <trans-unit id="1bd7ccbde8d3077fec1f549017e747393223a900" resname="MimeType" approved="yes">
        <source>MimeType</source>
-        <target state="new">MimeType</target>
+        <target state="translated">MimeType</target>
        <jms:reference-file line="374">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="cb4f425374af2741715669ed8b541a666078b729" resname="Minimum number of letters before truncation" approved="yes">
@@ -4411,9 +4411,9 @@
        <target state="translated">Multivalué</target>
        <jms:reference-file line="158">admin/fields/templates.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="1b369c4651e2b82200334fa587669b3828071192" resname="My application ">
+      <trans-unit id="1b369c4651e2b82200334fa587669b3828071192" resname="My application " approved="yes">
        <source>My application </source>
-        <target state="needs-translation">Mon application</target>
+        <target state="translated">Mon application</target>
        <jms:reference-file line="266">web/account/account.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="9f36fd4dc42df8a92572afe51d887c5f33dda5b0" resname="My baskets" approved="yes">
@@ -4548,9 +4548,9 @@
        <target state="translated">Aucune correspondance trouvée</target>
        <jms:reference-file line="8">web/geonames/city_list.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="f8ff49677b7d397b0de712de733cd8bc88ef22d3" resname="No metadata available">
+      <trans-unit id="f8ff49677b7d397b0de712de733cd8bc88ef22d3" resname="No metadata available" approved="yes">
        <source>No metadata available</source>
-        <target state="needs-translation">Pas de méta données disponible</target>
+        <target state="translated">Aucune métadonnée disponible</target>
        <jms:reference-file line="43">actions/Tools/metadata.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="ee0ccefc5da5a79647ce65575ea97814db7506b7" resname="No participants specified" approved="yes">
@@ -4584,9 +4584,9 @@
        <jms:reference-file line="8">WorkZone/Browser/Results.html.twig</jms:reference-file>
        <jms:reference-file line="111">WorkZone/Browser/Results.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="bfccc7c966ca427d629149d67548af04605eb746" resname="No thesaurus concept query">
+      <trans-unit id="bfccc7c966ca427d629149d67548af04605eb746" resname="No thesaurus concept query" approved="yes">
        <source>No thesaurus concept query</source>
-        <target state="new">No thesaurus concept query</target>
+        <target state="translated">Pas de recherche Thesaurus</target>
        <jms:reference-file line="16">prod/results/infos.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="6866c8b666718aff85382e93b25ef50cd321669b" resname="No users selected" approved="yes">
@@ -4788,9 +4788,9 @@
        <target state="translated">Ouvrir l'URL dans une nouvelle fenêtre</target>
        <jms:reference-file line="125">Core/Provider/TwigServiceProvider.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="e72184f55cc026514b7160d78c3c5aef63c2a050" resname="Or">
+      <trans-unit id="e72184f55cc026514b7160d78c3c5aef63c2a050" resname="Or" approved="yes">
        <source>Or</source>
-        <target state="needs-translation">Ou</target>
+        <target state="translated">Ou</target>
        <jms:reference-file line="35">prod/upload/upload.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="94946e4d2391ccf8ff24f984869ae8fcf9ede7c4" resname="Or login with" approved="yes">
@@ -4803,7 +4803,7 @@
      </trans-unit>
      <trans-unit id="1d75774c0f96b6ee44eb6643c9fea71b50b90ea8" resname="Order" approved="yes">
        <source>Order</source>
-        <target state="translated">Ordre d'affichage :</target>
+        <target state="translated">Ordre d'affichage</target>
        <jms:reference-file line="82">admin/fields/templates.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="f982eff2494d435291fce6a44332cad26e2d63bb" resname="Order has been denied" approved="yes">
@@ -4831,9 +4831,9 @@
        <target state="translated">Normale</target>
        <jms:reference-file line="151">Controller/Root/LoginController.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="86e4e3875420cdee95d08d4472073493729a7aee" resname="Orientation">
+      <trans-unit id="86e4e3875420cdee95d08d4472073493729a7aee" resname="Orientation" approved="yes">
        <source>Orientation</source>
-        <target state="new">Orientation</target>
+        <target state="translated">Orientation</target>
        <jms:reference-file line="360">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="77561f3d48cb738cc40f376dec4616a77da54ee1" resname="Original name" approved="yes">
@@ -4863,9 +4863,9 @@
        <jms:reference-file line="19">prod/upload/lazaret.html.twig</jms:reference-file>
        <jms:reference-file line="20">prod/upload/lazaret.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="600584c2d5ccb97c0c0c424d9f32d6b102fcb040" resname="Pages">
+      <trans-unit id="600584c2d5ccb97c0c0c424d9f32d6b102fcb040" resname="Pages" approved="yes">
        <source>Pages</source>
-        <target state="new">Pages</target>
+        <target state="translated">Pages</target>
        <jms:reference-file line="90">actions/Feedback/ListsMacros.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="fe42b90acc297644b70123354014701c49384489" resname="Paniers" approved="yes">
@@ -4912,19 +4912,19 @@
        <target state="translated">L'année dernière</target>
        <jms:reference-file line="60">WorkZone/Browser/Browser.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="519e39132bb98418cc0483cc446ccf5f3c8dcffe" resname="Path">
+      <trans-unit id="519e39132bb98418cc0483cc446ccf5f3c8dcffe" resname="Path" approved="yes">
        <source>Path</source>
-        <target state="new">Path</target>
+        <target state="translated">Chemin</target>
        <jms:reference-file line="388">web/admin/subdefs.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="781961bc81c25697841ecce5d4d9dad9f6b261c6" resname="Pause">
+      <trans-unit id="781961bc81c25697841ecce5d4d9dad9f6b261c6" resname="Pause" approved="yes">
        <source>Pause</source>
-        <target state="new">Pause</target>
+        <target state="translated">Pause</target>
        <jms:reference-file line="124">Controller/Prod/LanguageController.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="2a78f0e9eeb4969ad86a55df617e6bb0373df78f" resname="Pays">
+      <trans-unit id="2a78f0e9eeb4969ad86a55df617e6bb0373df78f" resname="Pays" approved="yes">
        <source>Pays</source>
-        <target state="new">Pays</target>
+        <target state="translated">Pays</target>
        <jms:reference-file line="32">prod/User/Add.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="3d8de900b56813bb78e97afbf22578720d473219" resname="Periodically fetches an FTP repository content locally" approved="yes">
@@ -4983,9 +4983,9 @@
        <target state="translated">Phraseanet recommande fortement l'utilisation de %link_start%MariaDB%link_end% à la place de MySQL.</target>
        <jms:reference-file line="612">web/setup/step2.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="5d12bd53552cafc41ca6146c04870df2e1574e13" resname="Play">
+      <trans-unit id="5d12bd53552cafc41ca6146c04870df2e1574e13" resname="Play" approved="yes">
        <source>Play</source>
-        <target state="new">Play</target>
+        <target state="translated">Play</target>
        <jms:reference-file line="122">Controller/Prod/LanguageController.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="cd95b41f85ddc0922e3fce8844279c55e9e3cdd9" resname="Playlist" approved="yes">
@@ -5832,9 +5832,9 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis
        <target state="translated">La colonne Password est manquante. Le script s'est arrêté.</target>
        <jms:reference-file line="14">user/import/file.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="1d72d3b024f99631791dcfbc8288caa16d3ff388" resname="Résultats des derniers envois effectués pour cette application">
+      <trans-unit id="1d72d3b024f99631791dcfbc8288caa16d3ff388" resname="Résultats des derniers envois effectués pour cette application" approved="yes">
        <source>Résultats des derniers envois effectués pour cette application</source>
-        <target state="new">Résultats des derniers envois effectués pour cette application</target>
+        <target state="translated">Résultats des derniers envois effectués pour cette application</target>
        <jms:reference-file line="127">web/developers/application.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="741cd64a01685389e2fabdb7091a3b70f6be63ee" resname="SMTP encryption" approved="yes">
@@ -5889,9 +5889,9 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis
        <target state="translated">Sauvegarder toutes les modifications</target>
        <jms:reference-file line="8">admin/fields/templates.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="a68dd32b578cf2863f4df4362232db4d80a9557c" resname="Save the list">
+      <trans-unit id="a68dd32b578cf2863f4df4362232db4d80a9557c" resname="Save the list" approved="yes">
        <source>Save the list</source>
-        <target state="new">Save the list</target>
+        <target state="translated">Sauvegarder la liste</target>
        <jms:reference-file line="86">actions/Feedback/list.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="e5c05c39658269a025f4dc37b50af1bb5ab946ca" resname="Save this list" approved="yes">
@@ -5914,9 +5914,9 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis
        <target state="translated">Moteur de recherche</target>
        <jms:reference-file line="61">Form/Configuration/MainConfigurationFormType.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="a41408e4e69d88053181c88ed06a4efe5855dc4a" resname="Search for existing user">
+      <trans-unit id="a41408e4e69d88053181c88ed06a4efe5855dc4a" resname="Search for existing user" approved="yes">
        <source>Search for existing user</source>
-        <target state="new">Search for existing user</target>
+        <target state="translated">Rechercher un utilisateur existant</target>
        <jms:reference-file line="23">actions/Feedback/List-Share.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="16c9aa8877f2b2a5067b5183327d5d35f0e8b5de" resname="SearchEngine settings" approved="yes">
@@ -5957,9 +5957,9 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis
        <target state="translated">Voir les autres</target>
        <jms:reference-file line="42">prod/actions/Push.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="76f0c2c4f58a932f4d61175ea0da5799c1b3c231" resname="See the list">
+      <trans-unit id="76f0c2c4f58a932f4d61175ea0da5799c1b3c231" resname="See the list" approved="yes">
        <source>See the list</source>
-        <target state="new">See the list</target>
+        <target state="translated">Voir la liste</target>
        <jms:reference-file line="134">actions/Feedback/list.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="7c2ce4a38c55478fb397967408b8c6d7c29fcc3b" resname="See validation results" approved="yes">
@@ -6002,9 +6002,9 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis
        <jms:reference-file line="56">admin/statusbit/edit.html.twig</jms:reference-file>
        <jms:reference-file line="121">admin/statusbit/edit.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="49fae2071d9672ce46d9fbadda409a3fa0cbc238" resname="Selected base(s)">
+      <trans-unit id="49fae2071d9672ce46d9fbadda409a3fa0cbc238" resname="Selected base(s)" approved="yes">
        <source>Selected base(s)</source>
-        <target state="needs-translation">Rechercher dans les Bases :</target>
+        <target state="translated">Sélectionner les Bases :</target>
        <jms:reference-file line="335">web/prod/index.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="2c418c187fb3108749d7156765e7b9b16a51215f" resname="Selected files" approved="yes">
@@ -6035,9 +6035,9 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis
        <target state="translated">Envoyer vers Facebook</target>
        <jms:reference-file line="32">prod/Share/record.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="60b2d62f2951ccf92ed7fb647ee7d6ab7ecfdd5e" resname="Send to Linkedin">
+      <trans-unit id="60b2d62f2951ccf92ed7fb647ee7d6ab7ecfdd5e" resname="Send to Linkedin" approved="yes">
        <source>Send to Linkedin</source>
-        <target state="new">Send to Linkedin</target>
+        <target state="translated">Envoyer vers LinkedIn</target>
        <jms:reference-file line="37">prod/Share/record.html.twig</jms:reference-file>
        <jms:reference-file line="38">prod/Share/record.html.twig</jms:reference-file>
        <jms:reference-file line="39">prod/Share/record.html.twig</jms:reference-file>
@@ -6115,9 +6115,9 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis
        <target state="translated">Partager</target>
        <jms:reference-file line="108">Controller/Prod/LanguageController.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="ce896454ee1650a73169d33b97a59cb8f90d6e6b" resname="Share my list">
+      <trans-unit id="ce896454ee1650a73169d33b97a59cb8f90d6e6b" resname="Share my list" approved="yes">
        <source>Share my list</source>
-        <target state="new">Share my list</target>
+        <target state="translated">Partager ma liste</target>
        <jms:reference-file line="31">actions/Feedback/list.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="3d9576616347132778bc28cffe80b27a914f9dd0" resname="Share the list" approved="yes">
@@ -6367,9 +6367,9 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis
        <target state="translated">Sous-définition</target>
        <jms:reference-file line="19">admin/databox/details.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="2dacf65959849884a011f36f76a04eebea94c5ea" resname="Submit">
+      <trans-unit id="2dacf65959849884a011f36f76a04eebea94c5ea" resname="Submit" approved="yes">
        <source>Submit</source>
-        <target state="needs-translation">Envoyé</target>
+        <target state="translated">Envoyer</target>
        <jms:reference-file line="120">Controller/Prod/LanguageController.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="8017bd7de9961cf42f59abc587d0495a9d25c2a9" resname="Substitute" approved="yes">
@@ -6563,9 +6563,9 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis
        <jms:reference-file line="6">web/login/cgus.html.twig</jms:reference-file>
        <jms:reference-file line="74">login/layout/base-layout.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="903b3a1a72b51b7b51f85ec8c81def53ed9c9b0c" resname="The Phraseanet Web API allows other web application to rely on this instance">
+      <trans-unit id="903b3a1a72b51b7b51f85ec8c81def53ed9c9b0c" resname="The Phraseanet Web API allows other web application to rely on this instance" approved="yes">
        <source>The Phraseanet Web API allows other web application to rely on this instance</source>
-        <target state="needs-translation">L'API Web Phraseanet permet à d'autres applications web de se reposer sur cette instance</target>
+        <target state="translated">L'API Web Phraseanet permet à d'autres applications web de se reposer sur cette instance</target>
        <jms:reference-file line="23">Form/Configuration/APIClientsFormType.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="2558cc2c887bbe4e2444ec6ef83b4982386e871a" resname="The URL you used is out of date, please login" approved="yes">
@@ -6853,9 +6853,9 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis
        <target state="translated">Jeton</target>
        <jms:reference-file line="109">web/developers/application.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="e894979930445d4b2bd8c947d6e2e6b816fcb0ab" resname="Token not found">
+      <trans-unit id="e894979930445d4b2bd8c947d6e2e6b816fcb0ab" resname="Token not found" approved="yes">
        <source>Token not found</source>
-        <target state="needs-translation">Token non trouvé</target>
+        <target state="translated">Token non trouvé</target>
        <jms:reference-file line="383">Controller/Root/AccountController.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="f97edaa0ce78a61e01095cae4169cada477d52dc" resname="Tool box" approved="yes">
@@ -7635,9 +7635,9 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis
        <target state="translated">Ecriture des métadonnées</target>
        <jms:reference-file line="498">web/admin/subdefs.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="d3f8f7b810c4b08f0b4ac4e47fdf8d265a10d869" resname="YYYY-MM-DD">
+      <trans-unit id="d3f8f7b810c4b08f0b4ac4e47fdf8d265a10d869" resname="YYYY-MM-DD" approved="yes">
        <source>YYYY-MM-DD</source>
-        <target state="needs-translation">AAAA-MM-JJ</target>
+        <target state="translated">AAAA-MM-JJ</target>
        <jms:reference-file line="10">web/report/form_date_and_base.html.twig</jms:reference-file>
        <jms:reference-file line="20">web/report/form_date_and_base.html.twig</jms:reference-file>
      </trans-unit>
@@ -7939,9 +7939,9 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis
        <target state="translated">Vos documents et leurs sous-résolutions (vignettes, prévisualisation et autres sous-définitions) sont stockés dans ces répertoires</target>
        <jms:reference-file line="736">web/setup/step2.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="bd5a589e9bed2de0b0180ca950ea0593249f7f69" resname="Your phraseanet account on %urlInstance% has been deleted!">
+      <trans-unit id="bd5a589e9bed2de0b0180ca950ea0593249f7f69" resname="Your phraseanet account on %urlInstance% has been deleted!" approved="yes">
        <source>Your phraseanet account on %urlInstance% has been deleted!</source>
-        <target state="needs-translation">Votre compte Phraseanet sur %urlInstance% a été supprimé!</target>
+        <target state="translated">Votre compte Phraseanet sur %urlInstance% a été supprimé!</target>
        <jms:reference-file line="29">Notification/Mail/MailSuccessAccountDelete.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="257253d658fdcbe73c4f4d02d2a3442ea8e4011d" resname="Your registration requests have been taken into account." approved="yes">
@@ -8908,29 +8908,29 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
        <target state="translated">Réglage d'agrégation</target>
        <jms:reference-file line="5">admin/search-engine/search-engine-settings.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="08772ff0da8ce970d5fac07a7afb6f855401d235" resname="admin::setup:personalisation_logo: download gabari">
+      <trans-unit id="08772ff0da8ce970d5fac07a7afb6f855401d235" resname="admin::setup:personalisation_logo: download gabari" approved="yes">
        <source>admin::setup:personalisation_logo: download gabari</source>
-        <target state="new">admin::setup:personalisation_logo: download gabari</target>
+        <target state="translated">Télécharger le gabarit</target>
        <jms:reference-file line="18">web/admin/personalisation_logo.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="a051f8357ca68bd96210d071cdfacfe8a54de2af" resname="admin::setup:personalisation_logo: error text dimension">
+      <trans-unit id="a051f8357ca68bd96210d071cdfacfe8a54de2af" resname="admin::setup:personalisation_logo: error text dimension" approved="yes">
        <source>admin::setup:personalisation_logo: error text dimension</source>
-        <target state="new">admin::setup:personalisation_logo: error text dimension</target>
+        <target state="translated">Erreur: La taille du fichier est incorrecte, merci de choisir la taille de 120 x 41 px au format .png</target>
        <jms:reference-file line="44">web/admin/personalisation_logo.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="4499d392aa84b8bf806252937b820281034ffd0c" resname="admin::setup:personalisation_logo: error text file type">
+      <trans-unit id="4499d392aa84b8bf806252937b820281034ffd0c" resname="admin::setup:personalisation_logo: error text file type" approved="yes">
        <source>admin::setup:personalisation_logo: error text file type</source>
-        <target state="new">admin::setup:personalisation_logo: error text file type</target>
+        <target state="translated">Erreur: Le format du fichier est incorrect, merci de choisir un fichier au format .png</target>
        <jms:reference-file line="45">web/admin/personalisation_logo.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="78a276b502761ddad6d621bf315ed17362b12748" resname="admin::setup:personalisation_logo: help text">
+      <trans-unit id="78a276b502761ddad6d621bf315ed17362b12748" resname="admin::setup:personalisation_logo: help text" approved="yes">
        <source>admin::setup:personalisation_logo: help text</source>
-        <target state="new">admin::setup:personalisation_logo: help text</target>
+        <target state="translated">Importez votre logo à la taille maximale de 120 x 41 px au format .png</target>
        <jms:reference-file line="16">web/admin/personalisation_logo.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="1ae037eda66d81b87705cdbdc04e4d8c0a953755" resname="admin::setup:personalisation_logo: select file">
+      <trans-unit id="1ae037eda66d81b87705cdbdc04e4d8c0a953755" resname="admin::setup:personalisation_logo: select file" approved="yes">
        <source>admin::setup:personalisation_logo: select file</source>
-        <target state="new">admin::setup:personalisation_logo: select file</target>
+        <target state="translated">Sélectionnez un fichier</target>
        <jms:reference-file line="31">web/admin/personalisation_logo.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="8fb48b51ad1962dc1b6a3643964f38fc48853161" resname="admin::status: case A" approved="yes">
@@ -9601,9 +9601,9 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
        <jms:reference-file line="62">prod/Share/record.html.twig</jms:reference-file>
        <jms:reference-file line="78">prod/Share/record.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="751a7df4249ede5126600fd5e11560b3300c8dd5" resname="create_subdef_button_label">
+      <trans-unit id="751a7df4249ede5126600fd5e11560b3300c8dd5" resname="create_subdef_button_label" approved="yes">
        <source>create_subdef_button_label</source>
-        <target state="needs-translation">Ajouter une sous définition</target>
+        <target state="translated">Ajouter une sous définition</target>
        <jms:reference-file line="340">web/admin/subdefs.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="cbfca5bce768bcbbc805fe6c760e2a2f8822cd3d" resname="create_subdef_modal_access_class" approved="yes">
@@ -9646,9 +9646,9 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
        <target state="new">create_subdef_modal_subdefinition_name</target>
        <jms:reference-file line="354">web/admin/subdefs.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="670f6628c7b72287a36ecd01262005e81428451c" resname="created_on">
+      <trans-unit id="670f6628c7b72287a36ecd01262005e81428451c" resname="created_on" approved="yes">
        <source>created_on</source>
-        <target state="new">created_on</target>
+        <target state="translated">créé le</target>
        <jms:reference-file line="466">web/prod/index.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="fc97186645dc71dae8e3221c8ce53c56e6d611bf" resname="dans %category%" approved="yes">
@@ -9667,9 +9667,9 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
        <target state="translated">Date d'ajout</target>
        <jms:reference-file line="141">SearchEngine/Elastic/ElasticSearchEngine.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="9422f3c3d1d722ee14182539cce3e00c003efd63" resname="date de modification">
+      <trans-unit id="9422f3c3d1d722ee14182539cce3e00c003efd63" resname="date de modification" approved="yes">
        <source>date de modification</source>
-        <target state="new">date de modification</target>
+        <target state="translated">date de modification</target>
        <jms:reference-file line="142">SearchEngine/Elastic/ElasticSearchEngine.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="41c882ad92672dcb86f0ede3f789f7542bcc82fc" resname="decembre" approved="yes">
@@ -9960,9 +9960,9 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
        <target state="translated">L'opérateur SAUF permet d’exclure un terme de la recherche</target>
        <jms:reference-file line="28">prod/results/help.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="f1705105cd12c7037b4a27b97b9453602ac45ebd" resname="help::help-section-bullet: use-OR-between-terms">
+      <trans-unit id="f1705105cd12c7037b4a27b97b9453602ac45ebd" resname="help::help-section-bullet: use-OR-between-terms" approved="yes">
        <source>help::help-section-bullet: use-OR-between-terms</source>
-        <target state="needs-translation">L'opérateur OU permet de rechercher plusieurs termes contenus dans les notices des médias</target>
+        <target state="translated">L'opérateur OU permet de rechercher plusieurs termes contenus dans les notices des médias</target>
        <jms:reference-file line="27">prod/results/help.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="c012913adefe76f9285c687ed30146a950f95c2c" resname="help::help-section-title: search-tips" approved="yes">
@@ -10002,19 +10002,19 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
        <target state="translated">Préférences sur les facettes</target>
        <jms:reference-file line="803">web/prod/index.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="2f830d57f4cedb2a49c7b109f9b91b0f8ba83e8b" resname="index::advance_search: facet-order">
+      <trans-unit id="2f830d57f4cedb2a49c7b109f9b91b0f8ba83e8b" resname="index::advance_search: facet-order" approved="yes">
        <source>index::advance_search: facet-order</source>
-        <target state="new">index::advance_search: facet-order</target>
+        <target state="translated">Ordre d'affichage des facettes</target>
        <jms:reference-file line="804">web/prod/index.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="5a25478cdd7fe21258071c4f3a5d9920225f9356" resname="index::advance_search: facet-tech-order">
+      <trans-unit id="5a25478cdd7fe21258071c4f3a5d9920225f9356" resname="index::advance_search: facet-tech-order" approved="yes">
        <source>index::advance_search: facet-tech-order</source>
-        <target state="new">index::advance_search: facet-tech-order</target>
+        <target state="translated">Ordre par défaut</target>
        <jms:reference-file line="810">web/prod/index.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="6b9516a3c46d7ad246a9fbb3df693ba6c783c986" resname="index::advance_search: facet-values-order">
+      <trans-unit id="6b9516a3c46d7ad246a9fbb3df693ba6c783c986" resname="index::advance_search: facet-values-order" approved="yes">
        <source>index::advance_search: facet-values-order</source>
-        <target state="needs-translation">Ordre des valeurs de facettes</target>
+        <target state="translated">Ordre des valeurs de facettes</target>
        <jms:reference-file line="816">web/prod/index.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="dfb02fcdeb804315cd6ad8388efcfb4ccc4abf38" resname="index::advance_search: hidden-facet-values-order">
@@ -10022,14 +10022,14 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
        <target state="needs-translation">Facettes Masquées</target>
        <jms:reference-file line="833">web/prod/index.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="4a35cc75d1072f7dad99c8e91596298f55f20a54" resname="index::advance_search: order-by-hits">
+      <trans-unit id="4a35cc75d1072f7dad99c8e91596298f55f20a54" resname="index::advance_search: order-by-hits" approved="yes">
        <source>index::advance_search: order-by-hits</source>
-        <target state="needs-translation">Trier les facettes par hits</target>
+        <target state="translated">Trier les facettes par hits</target>
        <jms:reference-file line="822">web/prod/index.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="1039a002699408da4c4fe74638a6b44f60499069" resname="index:advanced-preferences:: use truncation">
+      <trans-unit id="1039a002699408da4c4fe74638a6b44f60499069" resname="index:advanced-preferences:: use truncation" approved="yes">
        <source>index:advanced-preferences:: use truncation</source>
-        <target state="needs-translation">Activer la troncature</target>
+        <target state="translated">Activer la troncature</target>
        <jms:reference-file line="331">web/prod/index.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="830af6e37576114c7943a0e190f35ad2f0302b4d" resname="invite:: Redirection vers la zone d'authentification, cliquez sur OK pour continuer ou annulez" approved="yes">
@@ -10505,9 +10505,9 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
        <jms:reference-file line="117">prod/orders/order_box.html.twig</jms:reference-file>
        <jms:reference-file line="168">prod/orders/order_box.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="0259e4e17a1f2697d4f4f0108080276a5d7573de" resname="original logo">
+      <trans-unit id="0259e4e17a1f2697d4f4f0108080276a5d7573de" resname="original logo" approved="yes">
        <source>original logo</source>
-        <target state="new">original logo</target>
+        <target state="translated">Logo d'origine</target>
        <jms:reference-file line="23">Form/Configuration/PersonalisationLogoFormType.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="5898fc860300e228dcd54c0b1045b5fa0dcda502" resname="oui" approved="yes">
@@ -10598,9 +10598,9 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
        <target state="translated">par mois</target>
        <jms:reference-file line="62">web/admin/editusers_quotas.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="ead5a6379197deb9163d2101354822e6caaa30eb" resname="personalize logo">
+      <trans-unit id="ead5a6379197deb9163d2101354822e6caaa30eb" resname="personalize logo" approved="yes">
        <source>personalize logo</source>
-        <target state="new">personalize logo</target>
+        <target state="translated">Personnaliser le logo</target>
        <jms:reference-file line="24">Form/Configuration/PersonalisationLogoFormType.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="f16110620b1971f58336063cbdb64df7e0e0c7ac" resname="pertinence" approved="yes">
@@ -10633,9 +10633,9 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
        <target state="translated">Monter une base provenant d'un serveur different  de l'application box</target>
        <jms:reference-file line="103">web/admin/databases.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="6cb5c0796bbc3bf1d892ba5be804a7e53595ea1d" resname="phraseanet:: Preferences">
+      <trans-unit id="6cb5c0796bbc3bf1d892ba5be804a7e53595ea1d" resname="phraseanet:: Preferences" approved="yes">
        <source>phraseanet:: Preferences</source>
-        <target state="new">phraseanet:: Preferences</target>
+        <target state="translated">Préférences</target>
        <jms:reference-file line="255">web/prod/index.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="2751058550fb9a63ba3ffa07152ec68f594dec2a" resname="phraseanet:: Un email vient de vous etre envoye" approved="yes">
@@ -10803,49 +10803,49 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
        <target state="translated">Ne plus afficher ce message</target>
        <jms:reference-file line="38">Controller/Prod/LanguageController.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="245fd09d0518644a6580518f710add762804ca9a" resname="phraseanet::account The account has been deleted">
+      <trans-unit id="245fd09d0518644a6580518f710add762804ca9a" resname="phraseanet::account The account has been deleted" approved="yes">
        <source>phraseanet::account The account has been deleted</source>
-        <target state="needs-translation">Le compte a été supprimé</target>
+        <target state="translated">Le compte a été supprimé</target>
        <jms:reference-file line="544">Controller/Root/AccountController.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="bf7028b694aea3fc9ede5014a9f8b5d617b83b6f" resname="phraseanet::account: &lt;&lt; your account can be deleted via admin interface &gt;&gt; ">
+      <trans-unit id="bf7028b694aea3fc9ede5014a9f8b5d617b83b6f" resname="phraseanet::account: &lt;&lt; your account can be deleted via admin interface &gt;&gt; " approved="yes">
        <source><![CDATA[phraseanet::account: << your account can be deleted via admin interface >> ]]></source>
-        <target state="needs-translation">Vos droits ne vous permettent pas de réaliser cette action, votre compte ne peut être supprimé que via l'interface d'Administration.</target>
+        <target state="translated">Vos droits ne vous permettent pas de réaliser cette action, votre compte ne peut être supprimé que via l'interface d'Administration.</target>
        <jms:reference-file line="296">web/account/account.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="047b7994f5960aae108105ad5deadb5bbd72c8fc" resname="phraseanet::account: A confirmation e-mail has been sent. Please follow the instructions contained to continue account deletion">
+      <trans-unit id="047b7994f5960aae108105ad5deadb5bbd72c8fc" resname="phraseanet::account: A confirmation e-mail has been sent. Please follow the instructions contained to continue account deletion" approved="yes">
        <source>phraseanet::account: A confirmation e-mail has been sent. Please follow the instructions contained to continue account deletion</source>
-        <target state="needs-translation">Un email de confirmation a été envoyé. Veuillez suivre les instructions pour poursuivre la procédure de suppression du compte.</target>
+        <target state="translated">Un email de confirmation a été envoyé. Veuillez suivre les instructions pour poursuivre la procédure de suppression du compte.</target>
        <jms:reference-file line="360">Controller/Root/AccountController.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="d0ee9e2c90a05b113b00bf7accd590557bd78528" resname="phraseanet::account: Are you sure you want to delete your account?">
+      <trans-unit id="d0ee9e2c90a05b113b00bf7accd590557bd78528" resname="phraseanet::account: Are you sure you want to delete your account?" approved="yes">
        <source>phraseanet::account: Are you sure you want to delete your account?</source>
-        <target state="needs-translation">Etes-vous sûr(e) de vouloir supprimer votre compte?</target>
+        <target state="translated">Etes-vous sûr(e) de vouloir supprimer votre compte?</target>
        <jms:reference-file line="253">web/account/account.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="b98be91d0f8cadb22e52e6217584b7a11370fbb6" resname="phraseanet::account: Delete my account">
+      <trans-unit id="b98be91d0f8cadb22e52e6217584b7a11370fbb6" resname="phraseanet::account: Delete my account" approved="yes">
        <source>phraseanet::account: Delete my account</source>
-        <target state="needs-translation">Supprimer mon compte</target>
+        <target state="translated">Supprimer mon compte</target>
        <jms:reference-file line="244">web/account/account.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="b7993903466c49139bfae4c34c63446ff24b1474" resname="phraseanet::account: I am agree to delete my account">
+      <trans-unit id="b7993903466c49139bfae4c34c63446ff24b1474" resname="phraseanet::account: I am agree to delete my account" approved="yes">
        <source>phraseanet::account: I am agree to delete my account</source>
-        <target state="needs-translation">Je suis d'accord pour supprimer mon compte</target>
+        <target state="translated">Je suis d'accord pour supprimer mon compte</target>
        <jms:reference-file line="285">web/account/account.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="1b836fda2a5c65abfd05c215d4c4dd66361e4f0f" resname="phraseanet::account: I am agree to delete my account, need confirmation on mail">
+      <trans-unit id="1b836fda2a5c65abfd05c215d4c4dd66361e4f0f" resname="phraseanet::account: I am agree to delete my account, need confirmation on mail" approved="yes">
        <source>phraseanet::account: I am agree to delete my account, need confirmation on mail</source>
-        <target state="needs-translation">Je suis d'accord pour supprimer mon compte et j'ai besoin d'une confirmation par email</target>
+        <target state="translated">Je suis d'accord pour supprimer mon compte et j'ai besoin d'une confirmation par email</target>
        <jms:reference-file line="283">web/account/account.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="121aa945bfcb3565989acc06a1ccda5b36be6bf0" resname="phraseanet::account: List of data to be deleted">
+      <trans-unit id="121aa945bfcb3565989acc06a1ccda5b36be6bf0" resname="phraseanet::account: List of data to be deleted" approved="yes">
        <source>phraseanet::account: List of data to be deleted</source>
-        <target state="needs-translation">Liste des données à supprimer</target>
+        <target state="translated">Liste des données à supprimer</target>
        <jms:reference-file line="254">web/account/account.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="8d168955d9cfb26df27fbdcb4f83bbfe78654703" resname="phraseanet::account: My phraseanet account">
+      <trans-unit id="8d168955d9cfb26df27fbdcb4f83bbfe78654703" resname="phraseanet::account: My phraseanet account" approved="yes">
        <source>phraseanet::account: My phraseanet account</source>
-        <target state="needs-translation">Mon compte Phraseanet</target>
+        <target state="translated">Mon compte Phraseanet</target>
        <jms:reference-file line="274">web/account/account.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="9628f29074afd5c9bb42bb0b4c896f8bc32c192e" resname="phraseanet::chargement" approved="yes">
@@ -11147,9 +11147,9 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
        <target state="translated">Vous ne possédez pas les autorisations d'accès requises sur les documents pour effectuer cette action.</target>
        <jms:reference-file line="35">Controller/Prod/MoveCollectionController.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="ef27ad74061e0e15683e84dec7f5559f7797637f" resname="prod::advancesearch:tooltips:datefield_restriction_explanation">
+      <trans-unit id="ef27ad74061e0e15683e84dec7f5559f7797637f" resname="prod::advancesearch:tooltips:datefield_restriction_explanation" approved="yes">
        <source>prod::advancesearch:tooltips:datefield_restriction_explanation</source>
-        <target state="needs-translation">Limiter la recherche des résultats à des dates</target>
+        <target state="translated">Limiter la recherche des résultats à des dates</target>
        <jms:reference-file line="453">web/prod/index.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="fa55093d5fb1dfe235a46f8b4fecad5d36d3f250" resname="prod::advancesearch:tooltips:field_restriction_explanation">
@@ -11407,9 +11407,9 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
        <target state="translated">Remplacer le terme</target>
        <jms:reference-file line="19">web/prod/tab_thesaurus.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="556186e33fc15d5397f8b5f7a6855e822b354f9b" resname="prod::toolbar : video editor">
+      <trans-unit id="556186e33fc15d5397f8b5f7a6855e822b354f9b" resname="prod::toolbar : video editor" approved="yes">
        <source>prod::toolbar : video editor</source>
-        <target state="needs-translation">Outils video</target>
+        <target state="translated">Outils vidéo</target>
        <jms:reference-file line="72">web/prod/toolbar.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="6ad73c8fd370f62ccd3bf50cd9cc3563aed5273c" resname="prod::tools: document" approved="yes">
@@ -11418,9 +11418,9 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
        <jms:reference-file line="70">Controller/Prod/ToolsController.php</jms:reference-file>
        <jms:reference-file line="41">Controller/Prod/ShareController.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="501adfe6ea4c900a76df9f3c1d55834e6db5b9a9" resname="prod:app trash: also-move-record">
+      <trans-unit id="501adfe6ea4c900a76df9f3c1d55834e6db5b9a9" resname="prod:app trash: also-move-record" approved="yes">
        <source>prod:app trash: also-move-record</source>
-        <target state="needs-translation">Déplacer à la corbeille les enregistrements liés à ces reportages</target>
+        <target state="translated">Déplacer à la corbeille les enregistrements liés à ces reportages</target>
        <jms:reference-file line="28">prod/actions/delete_records_confirm.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="9dd9daa2dc851f005bbcb2ce0ea0c8de6b86ad52" resname="prod:app trash: record-delete" approved="yes">
@@ -11675,14 +11675,14 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
        <target state="translated">Sans titre</target>
        <jms:reference-file line="938">classes/record/adapter.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="0e0b1a1001cc76b95ef11cd1c208c87a03743b4b" resname="report:: 1 - Periode">
+      <trans-unit id="0e0b1a1001cc76b95ef11cd1c208c87a03743b4b" resname="report:: 1 - Periode" approved="yes">
        <source>report:: 1 - Periode</source>
-        <target state="needs-translation">Période</target>
+        <target state="translated">Période</target>
        <jms:reference-file line="3">web/report/form_date_and_base.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="87cb22fb5598f714cf44b13ef0d2fcfa0fe1e01a" resname="report:: 2 - Base">
+      <trans-unit id="87cb22fb5598f714cf44b13ef0d2fcfa0fe1e01a" resname="report:: 2 - Base" approved="yes">
        <source>report:: 2 - Base</source>
-        <target state="new">report:: 2 - Base</target>
+        <target state="translated">Bases</target>
        <jms:reference-file line="26">web/report/form_date_and_base.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="49e279e2253aaf0d8aebad389584f5c7c77e5a78" resname="report:: 3 - Collections" approved="yes">
@@ -11696,9 +11696,9 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
        <jms:reference-file line="11">web/report/report_layout_child.html.twig</jms:reference-file>
        <jms:reference-file line="36">web/report/report_layout_child.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="bbf54f30e0791db4dc06243d939468640ddb6cc5" resname="report:: 4 - Fields">
+      <trans-unit id="bbf54f30e0791db4dc06243d939468640ddb6cc5" resname="report:: 4 - Fields" approved="yes">
        <source>report:: 4 - Fields</source>
-        <target state="new">report:: 4 - Fields</target>
+        <target state="translated">Champs exportés</target>
        <jms:reference-file line="62">web/report/report_layout_child.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="67272ff4fb66e47f6a5e55c7171e994c69b6f162" resname="report:: Au (date)" approved="yes">
@@ -11713,9 +11713,9 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
        <jms:reference-file line="9">web/report/report_layout.html.twig</jms:reference-file>
        <jms:reference-file line="25">web/report/all_content.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="afa9685c95f7dff29cb2ad048da368c6e3dbadbc" resname="report:: Databox content">
+      <trans-unit id="afa9685c95f7dff29cb2ad048da368c6e3dbadbc" resname="report:: Databox content" approved="yes">
        <source>report:: Databox content</source>
-        <target state="new">report:: Databox content</target>
+        <target state="translated">Contenus</target>
        <jms:reference-file line="11">web/report/report_layout.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="afa00f7f0e9cf982c242e1a53235360b4aac707d" resname="report:: Detail des connexions" approved="yes">
@@ -12263,9 +12263,9 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
        <target state="new">setup::custom-link:title-custom-link</target>
        <jms:reference-file line="69">web/admin/setup.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="5107f9819cd4c0812c1d78cc07d24aff304c58fa" resname="share::share-record: advance">
+      <trans-unit id="5107f9819cd4c0812c1d78cc07d24aff304c58fa" resname="share::share-record: advance" approved="yes">
        <source>share::share-record: advance</source>
-        <target state="needs-translation">Réglage avancé</target>
+        <target state="translated">Réglage avancé</target>
        <jms:reference-file line="9">prod/Share/record.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="f51d8ca24dc67572beccf115c79671ba1c3f545a" resname="share::share-record: select-shared-def">
@@ -13049,9 +13049,9 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
        <target state="translated">Votre version est à jour :</target>
        <jms:reference-file line="53">web/admin/databases.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="cde2aa1e33b0a816e8539ae4669b9575a8c83762" resname="updated_on">
+      <trans-unit id="cde2aa1e33b0a816e8539ae4669b9575a8c83762" resname="updated_on" approved="yes">
        <source>updated_on</source>
-        <target state="new">updated_on</target>
+        <target state="translated">mis à jour le</target>
        <jms:reference-file line="465">web/prod/index.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="bc34ae0ecd7020a2f3f57afaf84d3fea6c3e9c0f" resname="upload:: Destination (collection) :" approved="yes">
--- a/resources/proxies/CGAlchemyPhraseaModelEntitiesAggregateToken.php
+++ b/resources/proxies/CGAlchemyPhraseaModelEntitiesAggregateToken.php
@@ -0,0 +1,235 @@
+<?php
+
+namespace Alchemy\Phrasea\Model\Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
+
+/**
+ * DO NOT EDIT THIS FILE - IT WAS CREATED BY DOCTRINE'S PROXY GENERATOR
+ */
+class AggregateToken extends \Alchemy\Phrasea\Model\Entities\AggregateToken implements \Doctrine\ORM\Proxy\Proxy
+{
+    /**
+     * @var \Closure the callback responsible for loading properties in the proxy object. This callback is called with
+     *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
+     *      initialization process and an array of ordered parameters that were passed to that method.
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     */
+    public $__initializer__;
+
+    /**
+     * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     */
+    public $__cloner__;
+
+    /**
+     * @var boolean flag indicating if this object was already initialized
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__isInitialized
+     */
+    public $__isInitialized__ = false;
+
+    /**
+     * @var array properties to be lazy loaded, with keys being the property
+     *            names and values being their default values
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     */
+    public static $lazyPropertiesDefaults = [];
+
+
+
+    /**
+     * @param \Closure $initializer
+     * @param \Closure $cloner
+     */
+    public function __construct($initializer = null, $cloner = null)
+    {
+
+        $this->__initializer__ = $initializer;
+        $this->__cloner__      = $cloner;
+    }
+
+
+
+
+
+
+
+    /**
+     * 
+     * @return array
+     */
+    public function __sleep()
+    {
+        if ($this->__isInitialized__) {
+            return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\AggregateToken' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\AggregateToken' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\AggregateToken' . "\0" . 'value'];
+        }
+
+        return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\AggregateToken' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\AggregateToken' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\AggregateToken' . "\0" . 'value'];
+    }
+
+    /**
+     * 
+     */
+    public function __wakeup()
+    {
+        if ( ! $this->__isInitialized__) {
+            $this->__initializer__ = function (AggregateToken $proxy) {
+                $proxy->__setInitializer(null);
+                $proxy->__setCloner(null);
+
+                $existingProperties = get_object_vars($proxy);
+
+                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                    if ( ! array_key_exists($property, $existingProperties)) {
+                        $proxy->$property = $defaultValue;
+                    }
+                }
+            };
+
+        }
+    }
+
+    /**
+     * 
+     */
+    public function __clone()
+    {
+        $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', []);
+    }
+
+    /**
+     * Forces initialization of the proxy
+     */
+    public function __load()
+    {
+        $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', []);
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __isInitialized()
+    {
+        return $this->__isInitialized__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitialized($initialized)
+    {
+        $this->__isInitialized__ = $initialized;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitializer(\Closure $initializer = null)
+    {
+        $this->__initializer__ = $initializer;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __getInitializer()
+    {
+        return $this->__initializer__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setCloner(\Closure $cloner = null)
+    {
+        $this->__cloner__ = $cloner;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific cloning logic
+     */
+    public function __getCloner()
+    {
+        return $this->__cloner__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @static
+     */
+    public function __getLazyProperties()
+    {
+        return self::$lazyPropertiesDefaults;
+    }
+
+    
+    /**
+     * {@inheritDoc}
+     */
+    public function getId()
+    {
+        if ($this->__isInitialized__ === false) {
+            return (int)  parent::getId();
+        }
+
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', []);
+
+        return parent::getId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setUser(\Alchemy\Phrasea\Model\Entities\User $user)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUser', [$user]);
+
+        return parent::setUser($user);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getUser()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUser', []);
+
+        return parent::getUser();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setValue($value)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setValue', [$value]);
+
+        return parent::setValue($value);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getValue()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getValue', []);
+
+        return parent::getValue();
+    }
+
+}
--- a/resources/proxies/CGAlchemyPhraseaModelEntitiesApiAccount.php
+++ b/resources/proxies/CGAlchemyPhraseaModelEntitiesApiAccount.php
@@ -0,0 +1,312 @@
+<?php
+
+namespace Alchemy\Phrasea\Model\Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
+
+/**
+ * DO NOT EDIT THIS FILE - IT WAS CREATED BY DOCTRINE'S PROXY GENERATOR
+ */
+class ApiAccount extends \Alchemy\Phrasea\Model\Entities\ApiAccount implements \Doctrine\ORM\Proxy\Proxy
+{
+    /**
+     * @var \Closure the callback responsible for loading properties in the proxy object. This callback is called with
+     *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
+     *      initialization process and an array of ordered parameters that were passed to that method.
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     */
+    public $__initializer__;
+
+    /**
+     * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     */
+    public $__cloner__;
+
+    /**
+     * @var boolean flag indicating if this object was already initialized
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__isInitialized
+     */
+    public $__isInitialized__ = false;
+
+    /**
+     * @var array properties to be lazy loaded, with keys being the property
+     *            names and values being their default values
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     */
+    public static $lazyPropertiesDefaults = [];
+
+
+
+    /**
+     * @param \Closure $initializer
+     * @param \Closure $cloner
+     */
+    public function __construct($initializer = null, $cloner = null)
+    {
+
+        $this->__initializer__ = $initializer;
+        $this->__cloner__      = $cloner;
+    }
+
+
+
+
+
+
+
+    /**
+     * 
+     * @return array
+     */
+    public function __sleep()
+    {
+        if ($this->__isInitialized__) {
+            return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiAccount' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiAccount' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiAccount' . "\0" . 'revoked', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiAccount' . "\0" . 'apiVersion', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiAccount' . "\0" . 'application', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiAccount' . "\0" . 'tokens', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiAccount' . "\0" . 'created'];
+        }
+
+        return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiAccount' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiAccount' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiAccount' . "\0" . 'revoked', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiAccount' . "\0" . 'apiVersion', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiAccount' . "\0" . 'application', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiAccount' . "\0" . 'tokens', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiAccount' . "\0" . 'created'];
+    }
+
+    /**
+     * 
+     */
+    public function __wakeup()
+    {
+        if ( ! $this->__isInitialized__) {
+            $this->__initializer__ = function (ApiAccount $proxy) {
+                $proxy->__setInitializer(null);
+                $proxy->__setCloner(null);
+
+                $existingProperties = get_object_vars($proxy);
+
+                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                    if ( ! array_key_exists($property, $existingProperties)) {
+                        $proxy->$property = $defaultValue;
+                    }
+                }
+            };
+
+        }
+    }
+
+    /**
+     * 
+     */
+    public function __clone()
+    {
+        $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', []);
+    }
+
+    /**
+     * Forces initialization of the proxy
+     */
+    public function __load()
+    {
+        $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', []);
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __isInitialized()
+    {
+        return $this->__isInitialized__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitialized($initialized)
+    {
+        $this->__isInitialized__ = $initialized;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitializer(\Closure $initializer = null)
+    {
+        $this->__initializer__ = $initializer;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __getInitializer()
+    {
+        return $this->__initializer__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setCloner(\Closure $cloner = null)
+    {
+        $this->__cloner__ = $cloner;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific cloning logic
+     */
+    public function __getCloner()
+    {
+        return $this->__cloner__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @static
+     */
+    public function __getLazyProperties()
+    {
+        return self::$lazyPropertiesDefaults;
+    }
+
+    
+    /**
+     * {@inheritDoc}
+     */
+    public function setApiVersion($apiVersion)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setApiVersion', [$apiVersion]);
+
+        return parent::setApiVersion($apiVersion);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getApiVersion()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getApiVersion', []);
+
+        return parent::getApiVersion();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setApplication(\Alchemy\Phrasea\Model\Entities\ApiApplication $application)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setApplication', [$application]);
+
+        return parent::setApplication($application);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getApplication()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getApplication', []);
+
+        return parent::getApplication();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setCreated(\DateTime $created)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreated', [$created]);
+
+        return parent::setCreated($created);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCreated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreated', []);
+
+        return parent::getCreated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getId()
+    {
+        if ($this->__isInitialized__ === false) {
+            return (int)  parent::getId();
+        }
+
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', []);
+
+        return parent::getId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setRevoked($revoked)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setRevoked', [$revoked]);
+
+        return parent::setRevoked($revoked);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function isRevoked()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'isRevoked', []);
+
+        return parent::isRevoked();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setUser(\Alchemy\Phrasea\Model\Entities\User $user)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUser', [$user]);
+
+        return parent::setUser($user);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getUser()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUser', []);
+
+        return parent::getUser();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function addTokens(\Alchemy\Phrasea\Model\Entities\ApiOauthToken $token)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'addTokens', [$token]);
+
+        return parent::addTokens($token);
+    }
+
+}
--- a/resources/proxies/CGAlchemyPhraseaModelEntitiesApiApplication.php
+++ b/resources/proxies/CGAlchemyPhraseaModelEntitiesApiApplication.php
@@ -0,0 +1,510 @@
+<?php
+
+namespace Alchemy\Phrasea\Model\Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
+
+/**
+ * DO NOT EDIT THIS FILE - IT WAS CREATED BY DOCTRINE'S PROXY GENERATOR
+ */
+class ApiApplication extends \Alchemy\Phrasea\Model\Entities\ApiApplication implements \Doctrine\ORM\Proxy\Proxy
+{
+    /**
+     * @var \Closure the callback responsible for loading properties in the proxy object. This callback is called with
+     *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
+     *      initialization process and an array of ordered parameters that were passed to that method.
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     */
+    public $__initializer__;
+
+    /**
+     * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     */
+    public $__cloner__;
+
+    /**
+     * @var boolean flag indicating if this object was already initialized
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__isInitialized
+     */
+    public $__isInitialized__ = false;
+
+    /**
+     * @var array properties to be lazy loaded, with keys being the property
+     *            names and values being their default values
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     */
+    public static $lazyPropertiesDefaults = [];
+
+
+
+    /**
+     * @param \Closure $initializer
+     * @param \Closure $cloner
+     */
+    public function __construct($initializer = null, $cloner = null)
+    {
+
+        $this->__initializer__ = $initializer;
+        $this->__cloner__      = $cloner;
+    }
+
+
+
+
+
+
+
+    /**
+     * 
+     * @return array
+     */
+    public function __sleep()
+    {
+        if ($this->__isInitialized__) {
+            return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiApplication' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiApplication' . "\0" . 'creator', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiApplication' . "\0" . 'type', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiApplication' . "\0" . 'name', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiApplication' . "\0" . 'description', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiApplication' . "\0" . 'website', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiApplication' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiApplication' . "\0" . 'updated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiApplication' . "\0" . 'clientId', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiApplication' . "\0" . 'clientSecret', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiApplication' . "\0" . 'nonce', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiApplication' . "\0" . 'redirectUri', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiApplication' . "\0" . 'activated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiApplication' . "\0" . 'grantPassword', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiApplication' . "\0" . 'accounts', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiApplication' . "\0" . 'webhookUrl'];
+        }
+
+        return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiApplication' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiApplication' . "\0" . 'creator', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiApplication' . "\0" . 'type', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiApplication' . "\0" . 'name', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiApplication' . "\0" . 'description', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiApplication' . "\0" . 'website', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiApplication' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiApplication' . "\0" . 'updated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiApplication' . "\0" . 'clientId', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiApplication' . "\0" . 'clientSecret', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiApplication' . "\0" . 'nonce', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiApplication' . "\0" . 'redirectUri', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiApplication' . "\0" . 'activated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiApplication' . "\0" . 'grantPassword', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiApplication' . "\0" . 'accounts', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiApplication' . "\0" . 'webhookUrl'];
+    }
+
+    /**
+     * 
+     */
+    public function __wakeup()
+    {
+        if ( ! $this->__isInitialized__) {
+            $this->__initializer__ = function (ApiApplication $proxy) {
+                $proxy->__setInitializer(null);
+                $proxy->__setCloner(null);
+
+                $existingProperties = get_object_vars($proxy);
+
+                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                    if ( ! array_key_exists($property, $existingProperties)) {
+                        $proxy->$property = $defaultValue;
+                    }
+                }
+            };
+
+        }
+    }
+
+    /**
+     * 
+     */
+    public function __clone()
+    {
+        $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', []);
+    }
+
+    /**
+     * Forces initialization of the proxy
+     */
+    public function __load()
+    {
+        $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', []);
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __isInitialized()
+    {
+        return $this->__isInitialized__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitialized($initialized)
+    {
+        $this->__isInitialized__ = $initialized;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitializer(\Closure $initializer = null)
+    {
+        $this->__initializer__ = $initializer;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __getInitializer()
+    {
+        return $this->__initializer__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setCloner(\Closure $cloner = null)
+    {
+        $this->__cloner__ = $cloner;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific cloning logic
+     */
+    public function __getCloner()
+    {
+        return $this->__cloner__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @static
+     */
+    public function __getLazyProperties()
+    {
+        return self::$lazyPropertiesDefaults;
+    }
+
+    
+    /**
+     * {@inheritDoc}
+     */
+    public function setActivated($activated)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setActivated', [$activated]);
+
+        return parent::setActivated($activated);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function isActivated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'isActivated', []);
+
+        return parent::isActivated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setClientId($clientId)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setClientId', [$clientId]);
+
+        return parent::setClientId($clientId);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getClientId()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getClientId', []);
+
+        return parent::getClientId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setClientSecret($clientSecret)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setClientSecret', [$clientSecret]);
+
+        return parent::setClientSecret($clientSecret);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getClientSecret()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getClientSecret', []);
+
+        return parent::getClientSecret();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setCreated(\DateTime $created)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreated', [$created]);
+
+        return parent::setCreated($created);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCreated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreated', []);
+
+        return parent::getCreated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setCreator(\Alchemy\Phrasea\Model\Entities\User $creator = NULL)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreator', [$creator]);
+
+        return parent::setCreator($creator);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCreator()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreator', []);
+
+        return parent::getCreator();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setDescription($description)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setDescription', [$description]);
+
+        return parent::setDescription($description);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getDescription()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getDescription', []);
+
+        return parent::getDescription();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setGrantPassword($grantPassword)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setGrantPassword', [$grantPassword]);
+
+        return parent::setGrantPassword($grantPassword);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function isPasswordGranted()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'isPasswordGranted', []);
+
+        return parent::isPasswordGranted();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getId()
+    {
+        if ($this->__isInitialized__ === false) {
+            return (int)  parent::getId();
+        }
+
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', []);
+
+        return parent::getId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setName($name)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setName', [$name]);
+
+        return parent::setName($name);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getName()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getName', []);
+
+        return parent::getName();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setNonce($nonce)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setNonce', [$nonce]);
+
+        return parent::setNonce($nonce);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getNonce()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getNonce', []);
+
+        return parent::getNonce();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setRedirectUri($redirectUri)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setRedirectUri', [$redirectUri]);
+
+        return parent::setRedirectUri($redirectUri);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getRedirectUri()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getRedirectUri', []);
+
+        return parent::getRedirectUri();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setType($type)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setType', [$type]);
+
+        return parent::setType($type);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getType()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getType', []);
+
+        return parent::getType();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setUpdated(\DateTime $updated)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUpdated', [$updated]);
+
+        return parent::setUpdated($updated);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getUpdated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUpdated', []);
+
+        return parent::getUpdated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setWebsite($website)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setWebsite', [$website]);
+
+        return parent::setWebsite($website);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getWebsite()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getWebsite', []);
+
+        return parent::getWebsite();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setWebhookUrl($webhookUrl)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setWebhookUrl', [$webhookUrl]);
+
+        return parent::setWebhookUrl($webhookUrl);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getWebhookUrl()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getWebhookUrl', []);
+
+        return parent::getWebhookUrl();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function addAccount(\Alchemy\Phrasea\Model\Entities\ApiAccount $account)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'addAccount', [$account]);
+
+        return parent::addAccount($account);
+    }
+
+}
--- a/resources/proxies/CGAlchemyPhraseaModelEntitiesApiLog.php
+++ b/resources/proxies/CGAlchemyPhraseaModelEntitiesApiLog.php
@@ -0,0 +1,455 @@
+<?php
+
+namespace Alchemy\Phrasea\Model\Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
+
+/**
+ * DO NOT EDIT THIS FILE - IT WAS CREATED BY DOCTRINE'S PROXY GENERATOR
+ */
+class ApiLog extends \Alchemy\Phrasea\Model\Entities\ApiLog implements \Doctrine\ORM\Proxy\Proxy
+{
+    /**
+     * @var \Closure the callback responsible for loading properties in the proxy object. This callback is called with
+     *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
+     *      initialization process and an array of ordered parameters that were passed to that method.
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     */
+    public $__initializer__;
+
+    /**
+     * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     */
+    public $__cloner__;
+
+    /**
+     * @var boolean flag indicating if this object was already initialized
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__isInitialized
+     */
+    public $__isInitialized__ = false;
+
+    /**
+     * @var array properties to be lazy loaded, with keys being the property
+     *            names and values being their default values
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     */
+    public static $lazyPropertiesDefaults = [];
+
+
+
+    /**
+     * @param \Closure $initializer
+     * @param \Closure $cloner
+     */
+    public function __construct($initializer = null, $cloner = null)
+    {
+
+        $this->__initializer__ = $initializer;
+        $this->__cloner__      = $cloner;
+    }
+
+
+
+
+
+
+
+    /**
+     * 
+     * @return array
+     */
+    public function __sleep()
+    {
+        if ($this->__isInitialized__) {
+            return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiLog' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiLog' . "\0" . 'account', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiLog' . "\0" . 'route', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiLog' . "\0" . 'method', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiLog' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiLog' . "\0" . 'statusCode', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiLog' . "\0" . 'format', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiLog' . "\0" . 'resource', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiLog' . "\0" . 'general', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiLog' . "\0" . 'aspect', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiLog' . "\0" . 'action', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiLog' . "\0" . 'errorCode', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiLog' . "\0" . 'errorMessage'];
+        }
+
+        return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiLog' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiLog' . "\0" . 'account', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiLog' . "\0" . 'route', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiLog' . "\0" . 'method', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiLog' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiLog' . "\0" . 'statusCode', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiLog' . "\0" . 'format', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiLog' . "\0" . 'resource', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiLog' . "\0" . 'general', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiLog' . "\0" . 'aspect', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiLog' . "\0" . 'action', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiLog' . "\0" . 'errorCode', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiLog' . "\0" . 'errorMessage'];
+    }
+
+    /**
+     * 
+     */
+    public function __wakeup()
+    {
+        if ( ! $this->__isInitialized__) {
+            $this->__initializer__ = function (ApiLog $proxy) {
+                $proxy->__setInitializer(null);
+                $proxy->__setCloner(null);
+
+                $existingProperties = get_object_vars($proxy);
+
+                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                    if ( ! array_key_exists($property, $existingProperties)) {
+                        $proxy->$property = $defaultValue;
+                    }
+                }
+            };
+
+        }
+    }
+
+    /**
+     * 
+     */
+    public function __clone()
+    {
+        $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', []);
+    }
+
+    /**
+     * Forces initialization of the proxy
+     */
+    public function __load()
+    {
+        $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', []);
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __isInitialized()
+    {
+        return $this->__isInitialized__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitialized($initialized)
+    {
+        $this->__isInitialized__ = $initialized;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitializer(\Closure $initializer = null)
+    {
+        $this->__initializer__ = $initializer;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __getInitializer()
+    {
+        return $this->__initializer__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setCloner(\Closure $cloner = null)
+    {
+        $this->__cloner__ = $cloner;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific cloning logic
+     */
+    public function __getCloner()
+    {
+        return $this->__cloner__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @static
+     */
+    public function __getLazyProperties()
+    {
+        return self::$lazyPropertiesDefaults;
+    }
+
+    
+    /**
+     * {@inheritDoc}
+     */
+    public function setAccount(\Alchemy\Phrasea\Model\Entities\ApiAccount $account)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setAccount', [$account]);
+
+        return parent::setAccount($account);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getAccount()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getAccount', []);
+
+        return parent::getAccount();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setAction($action)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setAction', [$action]);
+
+        return parent::setAction($action);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getAction()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getAction', []);
+
+        return parent::getAction();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setAspect($aspect)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setAspect', [$aspect]);
+
+        return parent::setAspect($aspect);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getAspect()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getAspect', []);
+
+        return parent::getAspect();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setErrorCode($errorCode)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setErrorCode', [$errorCode]);
+
+        return parent::setErrorCode($errorCode);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getErrorCode()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getErrorCode', []);
+
+        return parent::getErrorCode();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setErrorMessage($errorMessage)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setErrorMessage', [$errorMessage]);
+
+        return parent::setErrorMessage($errorMessage);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getErrorMessage()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getErrorMessage', []);
+
+        return parent::getErrorMessage();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setFormat($format)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setFormat', [$format]);
+
+        return parent::setFormat($format);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getFormat()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getFormat', []);
+
+        return parent::getFormat();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setGeneral($general)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setGeneral', [$general]);
+
+        return parent::setGeneral($general);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getGeneral()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getGeneral', []);
+
+        return parent::getGeneral();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setResource($resource)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setResource', [$resource]);
+
+        return parent::setResource($resource);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getResource()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getResource', []);
+
+        return parent::getResource();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setRoute($route)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setRoute', [$route]);
+
+        return parent::setRoute($route);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getRoute()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getRoute', []);
+
+        return parent::getRoute();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setStatusCode($statusCode)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setStatusCode', [$statusCode]);
+
+        return parent::setStatusCode($statusCode);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getStatusCode()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getStatusCode', []);
+
+        return parent::getStatusCode();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setCreated(\DateTime $created)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreated', [$created]);
+
+        return parent::setCreated($created);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCreated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreated', []);
+
+        return parent::getCreated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getId()
+    {
+        if ($this->__isInitialized__ === false) {
+            return (int)  parent::getId();
+        }
+
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', []);
+
+        return parent::getId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setMethod($method)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setMethod', [$method]);
+
+        return parent::setMethod($method);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getMethod()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getMethod', []);
+
+        return parent::getMethod();
+    }
+
+}
--- a/resources/proxies/CGAlchemyPhraseaModelEntitiesApiOauthCode.php
+++ b/resources/proxies/CGAlchemyPhraseaModelEntitiesApiOauthCode.php
@@ -0,0 +1,334 @@
+<?php
+
+namespace Alchemy\Phrasea\Model\Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
+
+/**
+ * DO NOT EDIT THIS FILE - IT WAS CREATED BY DOCTRINE'S PROXY GENERATOR
+ */
+class ApiOauthCode extends \Alchemy\Phrasea\Model\Entities\ApiOauthCode implements \Doctrine\ORM\Proxy\Proxy
+{
+    /**
+     * @var \Closure the callback responsible for loading properties in the proxy object. This callback is called with
+     *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
+     *      initialization process and an array of ordered parameters that were passed to that method.
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     */
+    public $__initializer__;
+
+    /**
+     * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     */
+    public $__cloner__;
+
+    /**
+     * @var boolean flag indicating if this object was already initialized
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__isInitialized
+     */
+    public $__isInitialized__ = false;
+
+    /**
+     * @var array properties to be lazy loaded, with keys being the property
+     *            names and values being their default values
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     */
+    public static $lazyPropertiesDefaults = [];
+
+
+
+    /**
+     * @param \Closure $initializer
+     * @param \Closure $cloner
+     */
+    public function __construct($initializer = null, $cloner = null)
+    {
+
+        $this->__initializer__ = $initializer;
+        $this->__cloner__      = $cloner;
+    }
+
+
+
+
+
+
+
+    /**
+     * 
+     * @return array
+     */
+    public function __sleep()
+    {
+        if ($this->__isInitialized__) {
+            return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthCode' . "\0" . 'code', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthCode' . "\0" . 'account', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthCode' . "\0" . 'redirectUri', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthCode' . "\0" . 'expires', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthCode' . "\0" . 'scope', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthCode' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthCode' . "\0" . 'updated'];
+        }
+
+        return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthCode' . "\0" . 'code', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthCode' . "\0" . 'account', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthCode' . "\0" . 'redirectUri', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthCode' . "\0" . 'expires', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthCode' . "\0" . 'scope', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthCode' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthCode' . "\0" . 'updated'];
+    }
+
+    /**
+     * 
+     */
+    public function __wakeup()
+    {
+        if ( ! $this->__isInitialized__) {
+            $this->__initializer__ = function (ApiOauthCode $proxy) {
+                $proxy->__setInitializer(null);
+                $proxy->__setCloner(null);
+
+                $existingProperties = get_object_vars($proxy);
+
+                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                    if ( ! array_key_exists($property, $existingProperties)) {
+                        $proxy->$property = $defaultValue;
+                    }
+                }
+            };
+
+        }
+    }
+
+    /**
+     * 
+     */
+    public function __clone()
+    {
+        $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', []);
+    }
+
+    /**
+     * Forces initialization of the proxy
+     */
+    public function __load()
+    {
+        $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', []);
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __isInitialized()
+    {
+        return $this->__isInitialized__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitialized($initialized)
+    {
+        $this->__isInitialized__ = $initialized;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitializer(\Closure $initializer = null)
+    {
+        $this->__initializer__ = $initializer;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __getInitializer()
+    {
+        return $this->__initializer__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setCloner(\Closure $cloner = null)
+    {
+        $this->__cloner__ = $cloner;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific cloning logic
+     */
+    public function __getCloner()
+    {
+        return $this->__cloner__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @static
+     */
+    public function __getLazyProperties()
+    {
+        return self::$lazyPropertiesDefaults;
+    }
+
+    
+    /**
+     * {@inheritDoc}
+     */
+    public function setAccount(\Alchemy\Phrasea\Model\Entities\ApiAccount $account)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setAccount', [$account]);
+
+        return parent::setAccount($account);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getAccount()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getAccount', []);
+
+        return parent::getAccount();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setCode($code)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCode', [$code]);
+
+        return parent::setCode($code);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCode()
+    {
+        if ($this->__isInitialized__ === false) {
+            return  parent::getCode();
+        }
+
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCode', []);
+
+        return parent::getCode();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setCreated(\DateTime $created)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreated', [$created]);
+
+        return parent::setCreated($created);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCreated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreated', []);
+
+        return parent::getCreated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setExpires($timestamp)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setExpires', [$timestamp]);
+
+        return parent::setExpires($timestamp);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getExpires()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getExpires', []);
+
+        return parent::getExpires();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setRedirectUri($redirectUri)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setRedirectUri', [$redirectUri]);
+
+        return parent::setRedirectUri($redirectUri);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getRedirectUri()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getRedirectUri', []);
+
+        return parent::getRedirectUri();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setScope($scope)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setScope', [$scope]);
+
+        return parent::setScope($scope);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getScope()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getScope', []);
+
+        return parent::getScope();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setUpdated(\DateTime $updated)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUpdated', [$updated]);
+
+        return parent::setUpdated($updated);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getUpdated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUpdated', []);
+
+        return parent::getUpdated();
+    }
+
+}
--- a/resources/proxies/CGAlchemyPhraseaModelEntitiesApiOauthRefreshToken.php
+++ b/resources/proxies/CGAlchemyPhraseaModelEntitiesApiOauthRefreshToken.php
@@ -0,0 +1,312 @@
+<?php
+
+namespace Alchemy\Phrasea\Model\Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
+
+/**
+ * DO NOT EDIT THIS FILE - IT WAS CREATED BY DOCTRINE'S PROXY GENERATOR
+ */
+class ApiOauthRefreshToken extends \Alchemy\Phrasea\Model\Entities\ApiOauthRefreshToken implements \Doctrine\ORM\Proxy\Proxy
+{
+    /**
+     * @var \Closure the callback responsible for loading properties in the proxy object. This callback is called with
+     *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
+     *      initialization process and an array of ordered parameters that were passed to that method.
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     */
+    public $__initializer__;
+
+    /**
+     * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     */
+    public $__cloner__;
+
+    /**
+     * @var boolean flag indicating if this object was already initialized
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__isInitialized
+     */
+    public $__isInitialized__ = false;
+
+    /**
+     * @var array properties to be lazy loaded, with keys being the property
+     *            names and values being their default values
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     */
+    public static $lazyPropertiesDefaults = [];
+
+
+
+    /**
+     * @param \Closure $initializer
+     * @param \Closure $cloner
+     */
+    public function __construct($initializer = null, $cloner = null)
+    {
+
+        $this->__initializer__ = $initializer;
+        $this->__cloner__      = $cloner;
+    }
+
+
+
+
+
+
+
+    /**
+     * 
+     * @return array
+     */
+    public function __sleep()
+    {
+        if ($this->__isInitialized__) {
+            return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthRefreshToken' . "\0" . 'refreshToken', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthRefreshToken' . "\0" . 'account', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthRefreshToken' . "\0" . 'expires', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthRefreshToken' . "\0" . 'scope', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthRefreshToken' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthRefreshToken' . "\0" . 'updated'];
+        }
+
+        return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthRefreshToken' . "\0" . 'refreshToken', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthRefreshToken' . "\0" . 'account', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthRefreshToken' . "\0" . 'expires', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthRefreshToken' . "\0" . 'scope', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthRefreshToken' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthRefreshToken' . "\0" . 'updated'];
+    }
+
+    /**
+     * 
+     */
+    public function __wakeup()
+    {
+        if ( ! $this->__isInitialized__) {
+            $this->__initializer__ = function (ApiOauthRefreshToken $proxy) {
+                $proxy->__setInitializer(null);
+                $proxy->__setCloner(null);
+
+                $existingProperties = get_object_vars($proxy);
+
+                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                    if ( ! array_key_exists($property, $existingProperties)) {
+                        $proxy->$property = $defaultValue;
+                    }
+                }
+            };
+
+        }
+    }
+
+    /**
+     * 
+     */
+    public function __clone()
+    {
+        $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', []);
+    }
+
+    /**
+     * Forces initialization of the proxy
+     */
+    public function __load()
+    {
+        $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', []);
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __isInitialized()
+    {
+        return $this->__isInitialized__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitialized($initialized)
+    {
+        $this->__isInitialized__ = $initialized;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitializer(\Closure $initializer = null)
+    {
+        $this->__initializer__ = $initializer;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __getInitializer()
+    {
+        return $this->__initializer__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setCloner(\Closure $cloner = null)
+    {
+        $this->__cloner__ = $cloner;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific cloning logic
+     */
+    public function __getCloner()
+    {
+        return $this->__cloner__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @static
+     */
+    public function __getLazyProperties()
+    {
+        return self::$lazyPropertiesDefaults;
+    }
+
+    
+    /**
+     * {@inheritDoc}
+     */
+    public function setAccount(\Alchemy\Phrasea\Model\Entities\ApiAccount $account)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setAccount', [$account]);
+
+        return parent::setAccount($account);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getAccount()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getAccount', []);
+
+        return parent::getAccount();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setCreated(\DateTime $created)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreated', [$created]);
+
+        return parent::setCreated($created);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCreated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreated', []);
+
+        return parent::getCreated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setExpires($expires)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setExpires', [$expires]);
+
+        return parent::setExpires($expires);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getExpires()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getExpires', []);
+
+        return parent::getExpires();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setRefreshToken($refreshToken)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setRefreshToken', [$refreshToken]);
+
+        return parent::setRefreshToken($refreshToken);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getRefreshToken()
+    {
+        if ($this->__isInitialized__ === false) {
+            return  parent::getRefreshToken();
+        }
+
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getRefreshToken', []);
+
+        return parent::getRefreshToken();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setScope($scope)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setScope', [$scope]);
+
+        return parent::setScope($scope);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getScope()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getScope', []);
+
+        return parent::getScope();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setUpdated(\DateTime $updated)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUpdated', [$updated]);
+
+        return parent::setUpdated($updated);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getUpdated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUpdated', []);
+
+        return parent::getUpdated();
+    }
+
+}
--- a/resources/proxies/CGAlchemyPhraseaModelEntitiesApiOauthToken.php
+++ b/resources/proxies/CGAlchemyPhraseaModelEntitiesApiOauthToken.php
@@ -0,0 +1,356 @@
+<?php
+
+namespace Alchemy\Phrasea\Model\Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
+
+/**
+ * DO NOT EDIT THIS FILE - IT WAS CREATED BY DOCTRINE'S PROXY GENERATOR
+ */
+class ApiOauthToken extends \Alchemy\Phrasea\Model\Entities\ApiOauthToken implements \Doctrine\ORM\Proxy\Proxy
+{
+    /**
+     * @var \Closure the callback responsible for loading properties in the proxy object. This callback is called with
+     *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
+     *      initialization process and an array of ordered parameters that were passed to that method.
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     */
+    public $__initializer__;
+
+    /**
+     * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     */
+    public $__cloner__;
+
+    /**
+     * @var boolean flag indicating if this object was already initialized
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__isInitialized
+     */
+    public $__isInitialized__ = false;
+
+    /**
+     * @var array properties to be lazy loaded, with keys being the property
+     *            names and values being their default values
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     */
+    public static $lazyPropertiesDefaults = [];
+
+
+
+    /**
+     * @param \Closure $initializer
+     * @param \Closure $cloner
+     */
+    public function __construct($initializer = null, $cloner = null)
+    {
+
+        $this->__initializer__ = $initializer;
+        $this->__cloner__      = $cloner;
+    }
+
+
+
+
+
+
+
+    /**
+     * 
+     * @return array
+     */
+    public function __sleep()
+    {
+        if ($this->__isInitialized__) {
+            return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthToken' . "\0" . 'oauthToken', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthToken' . "\0" . 'sessionId', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthToken' . "\0" . 'account', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthToken' . "\0" . 'expires', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthToken' . "\0" . 'lastUsed', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthToken' . "\0" . 'scope', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthToken' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthToken' . "\0" . 'updated'];
+        }
+
+        return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthToken' . "\0" . 'oauthToken', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthToken' . "\0" . 'sessionId', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthToken' . "\0" . 'account', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthToken' . "\0" . 'expires', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthToken' . "\0" . 'lastUsed', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthToken' . "\0" . 'scope', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthToken' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthToken' . "\0" . 'updated'];
+    }
+
+    /**
+     * 
+     */
+    public function __wakeup()
+    {
+        if ( ! $this->__isInitialized__) {
+            $this->__initializer__ = function (ApiOauthToken $proxy) {
+                $proxy->__setInitializer(null);
+                $proxy->__setCloner(null);
+
+                $existingProperties = get_object_vars($proxy);
+
+                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                    if ( ! array_key_exists($property, $existingProperties)) {
+                        $proxy->$property = $defaultValue;
+                    }
+                }
+            };
+
+        }
+    }
+
+    /**
+     * 
+     */
+    public function __clone()
+    {
+        $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', []);
+    }
+
+    /**
+     * Forces initialization of the proxy
+     */
+    public function __load()
+    {
+        $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', []);
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __isInitialized()
+    {
+        return $this->__isInitialized__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitialized($initialized)
+    {
+        $this->__isInitialized__ = $initialized;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitializer(\Closure $initializer = null)
+    {
+        $this->__initializer__ = $initializer;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __getInitializer()
+    {
+        return $this->__initializer__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setCloner(\Closure $cloner = null)
+    {
+        $this->__cloner__ = $cloner;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific cloning logic
+     */
+    public function __getCloner()
+    {
+        return $this->__cloner__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @static
+     */
+    public function __getLazyProperties()
+    {
+        return self::$lazyPropertiesDefaults;
+    }
+
+    
+    /**
+     * {@inheritDoc}
+     */
+    public function setAccount(\Alchemy\Phrasea\Model\Entities\ApiAccount $account)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setAccount', [$account]);
+
+        return parent::setAccount($account);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getAccount()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getAccount', []);
+
+        return parent::getAccount();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setCreated(\DateTime $created)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreated', [$created]);
+
+        return parent::setCreated($created);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCreated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreated', []);
+
+        return parent::getCreated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setExpires($expires = NULL)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setExpires', [$expires]);
+
+        return parent::setExpires($expires);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getExpires()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getExpires', []);
+
+        return parent::getExpires();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setOauthToken($oauthToken)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setOauthToken', [$oauthToken]);
+
+        return parent::setOauthToken($oauthToken);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getOauthToken()
+    {
+        if ($this->__isInitialized__ === false) {
+            return  parent::getOauthToken();
+        }
+
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getOauthToken', []);
+
+        return parent::getOauthToken();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setScope($scope)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setScope', [$scope]);
+
+        return parent::setScope($scope);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getScope()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getScope', []);
+
+        return parent::getScope();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setSessionId($sessionId)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setSessionId', [$sessionId]);
+
+        return parent::setSessionId($sessionId);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getSessionId()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getSessionId', []);
+
+        return parent::getSessionId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setUpdated(\DateTime $updated)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUpdated', [$updated]);
+
+        return parent::setUpdated($updated);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getUpdated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUpdated', []);
+
+        return parent::getUpdated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setLastUsed(\DateTime $lastUsed)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setLastUsed', [$lastUsed]);
+
+        return parent::setLastUsed($lastUsed);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getLastUsed()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getLastUsed', []);
+
+        return parent::getLastUsed();
+    }
+
+}
--- a/resources/proxies/CGAlchemyPhraseaModelEntitiesAuthFailure.php
+++ b/resources/proxies/CGAlchemyPhraseaModelEntitiesAuthFailure.php
@@ -0,0 +1,279 @@
+<?php
+
+namespace Alchemy\Phrasea\Model\Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
+
+/**
+ * DO NOT EDIT THIS FILE - IT WAS CREATED BY DOCTRINE'S PROXY GENERATOR
+ */
+class AuthFailure extends \Alchemy\Phrasea\Model\Entities\AuthFailure implements \Doctrine\ORM\Proxy\Proxy
+{
+    /**
+     * @var \Closure the callback responsible for loading properties in the proxy object. This callback is called with
+     *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
+     *      initialization process and an array of ordered parameters that were passed to that method.
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     */
+    public $__initializer__;
+
+    /**
+     * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     */
+    public $__cloner__;
+
+    /**
+     * @var boolean flag indicating if this object was already initialized
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__isInitialized
+     */
+    public $__isInitialized__ = false;
+
+    /**
+     * @var array properties to be lazy loaded, with keys being the property
+     *            names and values being their default values
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     */
+    public static $lazyPropertiesDefaults = [];
+
+
+
+    /**
+     * @param \Closure $initializer
+     * @param \Closure $cloner
+     */
+    public function __construct($initializer = null, $cloner = null)
+    {
+
+        $this->__initializer__ = $initializer;
+        $this->__cloner__      = $cloner;
+    }
+
+
+
+
+
+
+
+    /**
+     * 
+     * @return array
+     */
+    public function __sleep()
+    {
+        if ($this->__isInitialized__) {
+            return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\AuthFailure' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\AuthFailure' . "\0" . 'username', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\AuthFailure' . "\0" . 'ip', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\AuthFailure' . "\0" . 'locked', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\AuthFailure' . "\0" . 'created'];
+        }
+
+        return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\AuthFailure' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\AuthFailure' . "\0" . 'username', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\AuthFailure' . "\0" . 'ip', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\AuthFailure' . "\0" . 'locked', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\AuthFailure' . "\0" . 'created'];
+    }
+
+    /**
+     * 
+     */
+    public function __wakeup()
+    {
+        if ( ! $this->__isInitialized__) {
+            $this->__initializer__ = function (AuthFailure $proxy) {
+                $proxy->__setInitializer(null);
+                $proxy->__setCloner(null);
+
+                $existingProperties = get_object_vars($proxy);
+
+                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                    if ( ! array_key_exists($property, $existingProperties)) {
+                        $proxy->$property = $defaultValue;
+                    }
+                }
+            };
+
+        }
+    }
+
+    /**
+     * 
+     */
+    public function __clone()
+    {
+        $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', []);
+    }
+
+    /**
+     * Forces initialization of the proxy
+     */
+    public function __load()
+    {
+        $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', []);
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __isInitialized()
+    {
+        return $this->__isInitialized__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitialized($initialized)
+    {
+        $this->__isInitialized__ = $initialized;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitializer(\Closure $initializer = null)
+    {
+        $this->__initializer__ = $initializer;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __getInitializer()
+    {
+        return $this->__initializer__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setCloner(\Closure $cloner = null)
+    {
+        $this->__cloner__ = $cloner;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific cloning logic
+     */
+    public function __getCloner()
+    {
+        return $this->__cloner__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @static
+     */
+    public function __getLazyProperties()
+    {
+        return self::$lazyPropertiesDefaults;
+    }
+
+    
+    /**
+     * {@inheritDoc}
+     */
+    public function getId()
+    {
+        if ($this->__isInitialized__ === false) {
+            return (int)  parent::getId();
+        }
+
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', []);
+
+        return parent::getId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setUsername($username)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUsername', [$username]);
+
+        return parent::setUsername($username);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getUsername()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUsername', []);
+
+        return parent::getUsername();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setIp($ip)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setIp', [$ip]);
+
+        return parent::setIp($ip);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getIp()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getIp', []);
+
+        return parent::getIp();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setLocked($locked)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setLocked', [$locked]);
+
+        return parent::setLocked($locked);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getLocked()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getLocked', []);
+
+        return parent::getLocked();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setCreated(\DateTime $created)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreated', [$created]);
+
+        return parent::setCreated($created);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCreated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreated', []);
+
+        return parent::getCreated();
+    }
+
+}
--- a/resources/proxies/CGAlchemyPhraseaModelEntitiesBasket.php
+++ b/resources/proxies/CGAlchemyPhraseaModelEntitiesBasket.php
@@ -0,0 +1,488 @@
+<?php
+
+namespace Alchemy\Phrasea\Model\Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
+
+/**
+ * DO NOT EDIT THIS FILE - IT WAS CREATED BY DOCTRINE'S PROXY GENERATOR
+ */
+class Basket extends \Alchemy\Phrasea\Model\Entities\Basket implements \Doctrine\ORM\Proxy\Proxy
+{
+    /**
+     * @var \Closure the callback responsible for loading properties in the proxy object. This callback is called with
+     *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
+     *      initialization process and an array of ordered parameters that were passed to that method.
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     */
+    public $__initializer__;
+
+    /**
+     * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     */
+    public $__cloner__;
+
+    /**
+     * @var boolean flag indicating if this object was already initialized
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__isInitialized
+     */
+    public $__isInitialized__ = false;
+
+    /**
+     * @var array properties to be lazy loaded, with keys being the property
+     *            names and values being their default values
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     */
+    public static $lazyPropertiesDefaults = [];
+
+
+
+    /**
+     * @param \Closure $initializer
+     * @param \Closure $cloner
+     */
+    public function __construct($initializer = null, $cloner = null)
+    {
+
+        $this->__initializer__ = $initializer;
+        $this->__cloner__      = $cloner;
+    }
+
+
+
+
+
+
+
+    /**
+     * 
+     * @return array
+     */
+    public function __sleep()
+    {
+        if ($this->__isInitialized__) {
+            return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'name', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'description', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'isRead', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'pusher', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'archived', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'updated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'validation', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'elements', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'order'];
+        }
+
+        return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'name', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'description', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'isRead', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'pusher', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'archived', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'updated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'validation', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'elements', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'order'];
+    }
+
+    /**
+     * 
+     */
+    public function __wakeup()
+    {
+        if ( ! $this->__isInitialized__) {
+            $this->__initializer__ = function (Basket $proxy) {
+                $proxy->__setInitializer(null);
+                $proxy->__setCloner(null);
+
+                $existingProperties = get_object_vars($proxy);
+
+                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                    if ( ! array_key_exists($property, $existingProperties)) {
+                        $proxy->$property = $defaultValue;
+                    }
+                }
+            };
+
+        }
+    }
+
+    /**
+     * 
+     */
+    public function __clone()
+    {
+        $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', []);
+    }
+
+    /**
+     * Forces initialization of the proxy
+     */
+    public function __load()
+    {
+        $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', []);
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __isInitialized()
+    {
+        return $this->__isInitialized__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitialized($initialized)
+    {
+        $this->__isInitialized__ = $initialized;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitializer(\Closure $initializer = null)
+    {
+        $this->__initializer__ = $initializer;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __getInitializer()
+    {
+        return $this->__initializer__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setCloner(\Closure $cloner = null)
+    {
+        $this->__cloner__ = $cloner;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific cloning logic
+     */
+    public function __getCloner()
+    {
+        return $this->__cloner__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @static
+     */
+    public function __getLazyProperties()
+    {
+        return self::$lazyPropertiesDefaults;
+    }
+
+    
+    /**
+     * {@inheritDoc}
+     */
+    public function getId()
+    {
+        if ($this->__isInitialized__ === false) {
+            return (int)  parent::getId();
+        }
+
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', []);
+
+        return parent::getId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setName($name)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setName', [$name]);
+
+        return parent::setName($name);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getName()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getName', []);
+
+        return parent::getName();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setDescription($description)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setDescription', [$description]);
+
+        return parent::setDescription($description);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getDescription()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getDescription', []);
+
+        return parent::getDescription();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setUser(\Alchemy\Phrasea\Model\Entities\User $user)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUser', [$user]);
+
+        return parent::setUser($user);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getUser()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUser', []);
+
+        return parent::getUser();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function markRead()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'markRead', []);
+
+        return parent::markRead();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function markUnread()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'markUnread', []);
+
+        return parent::markUnread();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function isRead()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'isRead', []);
+
+        return parent::isRead();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setPusher(\Alchemy\Phrasea\Model\Entities\User $user = NULL)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setPusher', [$user]);
+
+        return parent::setPusher($user);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getPusher()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getPusher', []);
+
+        return parent::getPusher();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setArchived($archived)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setArchived', [$archived]);
+
+        return parent::setArchived($archived);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getArchived()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getArchived', []);
+
+        return parent::getArchived();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setCreated(\DateTime $created)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreated', [$created]);
+
+        return parent::setCreated($created);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCreated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreated', []);
+
+        return parent::getCreated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setUpdated(\DateTime $updated)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUpdated', [$updated]);
+
+        return parent::setUpdated($updated);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getUpdated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUpdated', []);
+
+        return parent::getUpdated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setValidation(\Alchemy\Phrasea\Model\Entities\ValidationSession $validation = NULL)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setValidation', [$validation]);
+
+        return parent::setValidation($validation);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getValidation()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getValidation', []);
+
+        return parent::getValidation();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function addElement(\Alchemy\Phrasea\Model\Entities\BasketElement $element)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'addElement', [$element]);
+
+        return parent::addElement($element);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function removeElement(\Alchemy\Phrasea\Model\Entities\BasketElement $element)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'removeElement', [$element]);
+
+        return parent::removeElement($element);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setOrder(\Alchemy\Phrasea\Model\Entities\Order $order = NULL)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setOrder', [$order]);
+
+        return parent::setOrder($order);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getOrder()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getOrder', []);
+
+        return parent::getOrder();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getElements()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getElements', []);
+
+        return parent::getElements();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getElementsByOrder($order)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getElementsByOrder', [$order]);
+
+        return parent::getElementsByOrder($order);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function hasRecord(\Alchemy\Phrasea\Application $app, \record_adapter $record)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'hasRecord', [$app, $record]);
+
+        return parent::hasRecord($app, $record);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getSize(\Alchemy\Phrasea\Application $app)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getSize', [$app]);
+
+        return parent::getSize($app);
+    }
+
+}
--- a/resources/proxies/CGAlchemyPhraseaModelEntitiesBasketElement.php
+++ b/resources/proxies/CGAlchemyPhraseaModelEntitiesBasketElement.php
@@ -0,0 +1,389 @@
+<?php
+
+namespace Alchemy\Phrasea\Model\Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
+
+/**
+ * DO NOT EDIT THIS FILE - IT WAS CREATED BY DOCTRINE'S PROXY GENERATOR
+ */
+class BasketElement extends \Alchemy\Phrasea\Model\Entities\BasketElement implements \Doctrine\ORM\Proxy\Proxy
+{
+    /**
+     * @var \Closure the callback responsible for loading properties in the proxy object. This callback is called with
+     *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
+     *      initialization process and an array of ordered parameters that were passed to that method.
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     */
+    public $__initializer__;
+
+    /**
+     * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     */
+    public $__cloner__;
+
+    /**
+     * @var boolean flag indicating if this object was already initialized
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__isInitialized
+     */
+    public $__isInitialized__ = false;
+
+    /**
+     * @var array properties to be lazy loaded, with keys being the property
+     *            names and values being their default values
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     */
+    public static $lazyPropertiesDefaults = [];
+
+
+
+    /**
+     * @param \Closure $initializer
+     * @param \Closure $cloner
+     */
+    public function __construct($initializer = null, $cloner = null)
+    {
+
+        $this->__initializer__ = $initializer;
+        $this->__cloner__      = $cloner;
+    }
+
+
+
+
+
+
+
+    /**
+     * 
+     * @return array
+     */
+    public function __sleep()
+    {
+        if ($this->__isInitialized__) {
+            return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\BasketElement' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\BasketElement' . "\0" . 'record_id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\BasketElement' . "\0" . 'sbas_id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\BasketElement' . "\0" . 'ord', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\BasketElement' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\BasketElement' . "\0" . 'updated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\BasketElement' . "\0" . 'validation_datas', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\BasketElement' . "\0" . 'basket'];
+        }
+
+        return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\BasketElement' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\BasketElement' . "\0" . 'record_id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\BasketElement' . "\0" . 'sbas_id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\BasketElement' . "\0" . 'ord', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\BasketElement' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\BasketElement' . "\0" . 'updated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\BasketElement' . "\0" . 'validation_datas', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\BasketElement' . "\0" . 'basket'];
+    }
+
+    /**
+     * 
+     */
+    public function __wakeup()
+    {
+        if ( ! $this->__isInitialized__) {
+            $this->__initializer__ = function (BasketElement $proxy) {
+                $proxy->__setInitializer(null);
+                $proxy->__setCloner(null);
+
+                $existingProperties = get_object_vars($proxy);
+
+                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                    if ( ! array_key_exists($property, $existingProperties)) {
+                        $proxy->$property = $defaultValue;
+                    }
+                }
+            };
+
+        }
+    }
+
+    /**
+     * 
+     */
+    public function __clone()
+    {
+        $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', []);
+    }
+
+    /**
+     * Forces initialization of the proxy
+     */
+    public function __load()
+    {
+        $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', []);
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __isInitialized()
+    {
+        return $this->__isInitialized__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitialized($initialized)
+    {
+        $this->__isInitialized__ = $initialized;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitializer(\Closure $initializer = null)
+    {
+        $this->__initializer__ = $initializer;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __getInitializer()
+    {
+        return $this->__initializer__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setCloner(\Closure $cloner = null)
+    {
+        $this->__cloner__ = $cloner;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific cloning logic
+     */
+    public function __getCloner()
+    {
+        return $this->__cloner__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @static
+     */
+    public function __getLazyProperties()
+    {
+        return self::$lazyPropertiesDefaults;
+    }
+
+    
+    /**
+     * {@inheritDoc}
+     */
+    public function getId()
+    {
+        if ($this->__isInitialized__ === false) {
+            return (int)  parent::getId();
+        }
+
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', []);
+
+        return parent::getId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setRecordId($recordId)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setRecordId', [$recordId]);
+
+        return parent::setRecordId($recordId);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getRecordId()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getRecordId', []);
+
+        return parent::getRecordId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setSbasId($sbasId)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setSbasId', [$sbasId]);
+
+        return parent::setSbasId($sbasId);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getSbasId()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getSbasId', []);
+
+        return parent::getSbasId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getRecord(\Alchemy\Phrasea\Application $app)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getRecord', [$app]);
+
+        return parent::getRecord($app);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setRecord(\record_adapter $record)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setRecord', [$record]);
+
+        return parent::setRecord($record);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setOrd($ord)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setOrd', [$ord]);
+
+        return parent::setOrd($ord);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getOrd()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getOrd', []);
+
+        return parent::getOrd();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setCreated(\DateTime $created)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreated', [$created]);
+
+        return parent::setCreated($created);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCreated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreated', []);
+
+        return parent::getCreated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setUpdated(\DateTime $updated)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUpdated', [$updated]);
+
+        return parent::setUpdated($updated);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getUpdated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUpdated', []);
+
+        return parent::getUpdated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function addValidationData(\Alchemy\Phrasea\Model\Entities\ValidationData $validationDatas)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'addValidationData', [$validationDatas]);
+
+        return parent::addValidationData($validationDatas);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function removeValidationData(\Alchemy\Phrasea\Model\Entities\ValidationData $validationDatas)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'removeValidationData', [$validationDatas]);
+
+        return parent::removeValidationData($validationDatas);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getValidationDatas()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getValidationDatas', []);
+
+        return parent::getValidationDatas();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setBasket(\Alchemy\Phrasea\Model\Entities\Basket $basket = NULL)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setBasket', [$basket]);
+
+        return parent::setBasket($basket);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getBasket()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getBasket', []);
+
+        return parent::getBasket();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getUserValidationDatas(\Alchemy\Phrasea\Model\Entities\User $user)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUserValidationDatas', [$user]);
+
+        return parent::getUserValidationDatas($user);
+    }
+
+}
--- a/resources/proxies/CGAlchemyPhraseaModelEntitiesFeed.php
+++ b/resources/proxies/CGAlchemyPhraseaModelEntitiesFeed.php
@@ -0,0 +1,587 @@
+<?php
+
+namespace Alchemy\Phrasea\Model\Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
+
+/**
+ * DO NOT EDIT THIS FILE - IT WAS CREATED BY DOCTRINE'S PROXY GENERATOR
+ */
+class Feed extends \Alchemy\Phrasea\Model\Entities\Feed implements \Doctrine\ORM\Proxy\Proxy
+{
+    /**
+     * @var \Closure the callback responsible for loading properties in the proxy object. This callback is called with
+     *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
+     *      initialization process and an array of ordered parameters that were passed to that method.
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     */
+    public $__initializer__;
+
+    /**
+     * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     */
+    public $__cloner__;
+
+    /**
+     * @var boolean flag indicating if this object was already initialized
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__isInitialized
+     */
+    public $__isInitialized__ = false;
+
+    /**
+     * @var array properties to be lazy loaded, with keys being the property
+     *            names and values being their default values
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     */
+    public static $lazyPropertiesDefaults = [];
+
+
+
+    /**
+     * @param \Closure $initializer
+     * @param \Closure $cloner
+     */
+    public function __construct($initializer = null, $cloner = null)
+    {
+
+        $this->__initializer__ = $initializer;
+        $this->__cloner__      = $cloner;
+    }
+
+
+
+
+
+
+
+    /**
+     * 
+     * @return array
+     */
+    public function __sleep()
+    {
+        if ($this->__isInitialized__) {
+            return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Feed' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Feed' . "\0" . 'public', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Feed' . "\0" . 'iconUrl', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Feed' . "\0" . 'baseId', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Feed' . "\0" . 'title', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Feed' . "\0" . 'subtitle', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Feed' . "\0" . 'createdOn', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Feed' . "\0" . 'updatedOn', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Feed' . "\0" . 'publishers', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Feed' . "\0" . 'entries', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Feed' . "\0" . 'tokens'];
+        }
+
+        return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Feed' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Feed' . "\0" . 'public', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Feed' . "\0" . 'iconUrl', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Feed' . "\0" . 'baseId', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Feed' . "\0" . 'title', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Feed' . "\0" . 'subtitle', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Feed' . "\0" . 'createdOn', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Feed' . "\0" . 'updatedOn', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Feed' . "\0" . 'publishers', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Feed' . "\0" . 'entries', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Feed' . "\0" . 'tokens'];
+    }
+
+    /**
+     * 
+     */
+    public function __wakeup()
+    {
+        if ( ! $this->__isInitialized__) {
+            $this->__initializer__ = function (Feed $proxy) {
+                $proxy->__setInitializer(null);
+                $proxy->__setCloner(null);
+
+                $existingProperties = get_object_vars($proxy);
+
+                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                    if ( ! array_key_exists($property, $existingProperties)) {
+                        $proxy->$property = $defaultValue;
+                    }
+                }
+            };
+
+        }
+    }
+
+    /**
+     * 
+     */
+    public function __clone()
+    {
+        $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', []);
+    }
+
+    /**
+     * Forces initialization of the proxy
+     */
+    public function __load()
+    {
+        $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', []);
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __isInitialized()
+    {
+        return $this->__isInitialized__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitialized($initialized)
+    {
+        $this->__isInitialized__ = $initialized;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitializer(\Closure $initializer = null)
+    {
+        $this->__initializer__ = $initializer;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __getInitializer()
+    {
+        return $this->__initializer__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setCloner(\Closure $cloner = null)
+    {
+        $this->__cloner__ = $cloner;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific cloning logic
+     */
+    public function __getCloner()
+    {
+        return $this->__cloner__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @static
+     */
+    public function __getLazyProperties()
+    {
+        return self::$lazyPropertiesDefaults;
+    }
+
+    
+    /**
+     * {@inheritDoc}
+     */
+    public function getId()
+    {
+        if ($this->__isInitialized__ === false) {
+            return (int)  parent::getId();
+        }
+
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', []);
+
+        return parent::getId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setIsPublic($public)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setIsPublic', [$public]);
+
+        return parent::setIsPublic($public);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function isPublic()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'isPublic', []);
+
+        return parent::isPublic();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setIconUrl($iconUrl)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setIconUrl', [$iconUrl]);
+
+        return parent::setIconUrl($iconUrl);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getIconUrl()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getIconUrl', []);
+
+        return parent::getIconUrl();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setBaseId($baseId)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setBaseId', [$baseId]);
+
+        return parent::setBaseId($baseId);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getBaseId()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getBaseId', []);
+
+        return parent::getBaseId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setTitle($title)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setTitle', [$title]);
+
+        return parent::setTitle($title);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getTitle()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getTitle', []);
+
+        return parent::getTitle();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function addPublisher(\Alchemy\Phrasea\Model\Entities\FeedPublisher $publishers)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'addPublisher', [$publishers]);
+
+        return parent::addPublisher($publishers);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function removePublisher(\Alchemy\Phrasea\Model\Entities\FeedPublisher $publishers)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'removePublisher', [$publishers]);
+
+        return parent::removePublisher($publishers);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getPublishers()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getPublishers', []);
+
+        return parent::getPublishers();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function addEntry(\Alchemy\Phrasea\Model\Entities\FeedEntry $entries)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'addEntry', [$entries]);
+
+        return parent::addEntry($entries);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function removeEntry(\Alchemy\Phrasea\Model\Entities\FeedEntry $entries)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'removeEntry', [$entries]);
+
+        return parent::removeEntry($entries);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getEntries()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getEntries', []);
+
+        return parent::getEntries();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getOwner()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getOwner', []);
+
+        return parent::getOwner();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function isOwner(\Alchemy\Phrasea\Model\Entities\User $user)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'isOwner', [$user]);
+
+        return parent::isOwner($user);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCollection(\Alchemy\Phrasea\Application $app)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCollection', [$app]);
+
+        return parent::getCollection($app);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setCollection(\collection $collection = NULL)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCollection', [$collection]);
+
+        return parent::setCollection($collection);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setCreatedOn($createdOn)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreatedOn', [$createdOn]);
+
+        return parent::setCreatedOn($createdOn);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCreatedOn()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreatedOn', []);
+
+        return parent::getCreatedOn();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setUpdatedOn($updatedOn)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUpdatedOn', [$updatedOn]);
+
+        return parent::setUpdatedOn($updatedOn);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getUpdatedOn()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUpdatedOn', []);
+
+        return parent::getUpdatedOn();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function isPublisher(\Alchemy\Phrasea\Model\Entities\User $user)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'isPublisher', [$user]);
+
+        return parent::isPublisher($user);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getPublisher(\Alchemy\Phrasea\Model\Entities\User $user)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getPublisher', [$user]);
+
+        return parent::getPublisher($user);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setSubtitle($subtitle)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setSubtitle', [$subtitle]);
+
+        return parent::setSubtitle($subtitle);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getSubtitle()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getSubtitle', []);
+
+        return parent::getSubtitle();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function isAggregated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'isAggregated', []);
+
+        return parent::isAggregated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCountTotalEntries()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCountTotalEntries', []);
+
+        return parent::getCountTotalEntries();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function hasAccess(\Alchemy\Phrasea\Model\Entities\User $user, \Alchemy\Phrasea\Application $app)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'hasAccess', [$user, $app]);
+
+        return parent::hasAccess($user, $app);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function addToken(\Alchemy\Phrasea\Model\Entities\FeedToken $tokens)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'addToken', [$tokens]);
+
+        return parent::addToken($tokens);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function removeToken(\Alchemy\Phrasea\Model\Entities\FeedToken $tokens)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'removeToken', [$tokens]);
+
+        return parent::removeToken($tokens);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getTokens()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getTokens', []);
+
+        return parent::getTokens();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function addEntrie(\Alchemy\Phrasea\Model\Entities\FeedEntry $entries)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'addEntrie', [$entries]);
+
+        return parent::addEntrie($entries);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function removeEntrie(\Alchemy\Phrasea\Model\Entities\FeedEntry $entries)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'removeEntrie', [$entries]);
+
+        return parent::removeEntrie($entries);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function hasPage($pageNumber, $nbEntriesByPage)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'hasPage', [$pageNumber, $nbEntriesByPage]);
+
+        return parent::hasPage($pageNumber, $nbEntriesByPage);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function isAccessible(\Alchemy\Phrasea\Model\Entities\User $user, \Alchemy\Phrasea\Application $app)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'isAccessible', [$user, $app]);
+
+        return parent::isAccessible($user, $app);
+    }
+
+}
--- a/resources/proxies/CGAlchemyPhraseaModelEntitiesFeedEntry.php
+++ b/resources/proxies/CGAlchemyPhraseaModelEntitiesFeedEntry.php
@@ -0,0 +1,422 @@
+<?php
+
+namespace Alchemy\Phrasea\Model\Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
+
+/**
+ * DO NOT EDIT THIS FILE - IT WAS CREATED BY DOCTRINE'S PROXY GENERATOR
+ */
+class FeedEntry extends \Alchemy\Phrasea\Model\Entities\FeedEntry implements \Doctrine\ORM\Proxy\Proxy
+{
+    /**
+     * @var \Closure the callback responsible for loading properties in the proxy object. This callback is called with
+     *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
+     *      initialization process and an array of ordered parameters that were passed to that method.
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     */
+    public $__initializer__;
+
+    /**
+     * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     */
+    public $__cloner__;
+
+    /**
+     * @var boolean flag indicating if this object was already initialized
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__isInitialized
+     */
+    public $__isInitialized__ = false;
+
+    /**
+     * @var array properties to be lazy loaded, with keys being the property
+     *            names and values being their default values
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     */
+    public static $lazyPropertiesDefaults = [];
+
+
+
+    /**
+     * @param \Closure $initializer
+     * @param \Closure $cloner
+     */
+    public function __construct($initializer = null, $cloner = null)
+    {
+
+        $this->__initializer__ = $initializer;
+        $this->__cloner__      = $cloner;
+    }
+
+
+
+
+
+
+
+    /**
+     * 
+     * @return array
+     */
+    public function __sleep()
+    {
+        if ($this->__isInitialized__) {
+            return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedEntry' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedEntry' . "\0" . 'title', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedEntry' . "\0" . 'subtitle', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedEntry' . "\0" . 'authorName', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedEntry' . "\0" . 'authorEmail', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedEntry' . "\0" . 'createdOn', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedEntry' . "\0" . 'updatedOn', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedEntry' . "\0" . 'items', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedEntry' . "\0" . 'publisher', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedEntry' . "\0" . 'feed'];
+        }
+
+        return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedEntry' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedEntry' . "\0" . 'title', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedEntry' . "\0" . 'subtitle', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedEntry' . "\0" . 'authorName', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedEntry' . "\0" . 'authorEmail', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedEntry' . "\0" . 'createdOn', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedEntry' . "\0" . 'updatedOn', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedEntry' . "\0" . 'items', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedEntry' . "\0" . 'publisher', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedEntry' . "\0" . 'feed'];
+    }
+
+    /**
+     * 
+     */
+    public function __wakeup()
+    {
+        if ( ! $this->__isInitialized__) {
+            $this->__initializer__ = function (FeedEntry $proxy) {
+                $proxy->__setInitializer(null);
+                $proxy->__setCloner(null);
+
+                $existingProperties = get_object_vars($proxy);
+
+                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                    if ( ! array_key_exists($property, $existingProperties)) {
+                        $proxy->$property = $defaultValue;
+                    }
+                }
+            };
+
+        }
+    }
+
+    /**
+     * 
+     */
+    public function __clone()
+    {
+        $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', []);
+    }
+
+    /**
+     * Forces initialization of the proxy
+     */
+    public function __load()
+    {
+        $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', []);
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __isInitialized()
+    {
+        return $this->__isInitialized__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitialized($initialized)
+    {
+        $this->__isInitialized__ = $initialized;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitializer(\Closure $initializer = null)
+    {
+        $this->__initializer__ = $initializer;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __getInitializer()
+    {
+        return $this->__initializer__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setCloner(\Closure $cloner = null)
+    {
+        $this->__cloner__ = $cloner;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific cloning logic
+     */
+    public function __getCloner()
+    {
+        return $this->__cloner__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @static
+     */
+    public function __getLazyProperties()
+    {
+        return self::$lazyPropertiesDefaults;
+    }
+
+    
+    /**
+     * {@inheritDoc}
+     */
+    public function getId()
+    {
+        if ($this->__isInitialized__ === false) {
+            return (int)  parent::getId();
+        }
+
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', []);
+
+        return parent::getId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setTitle($title)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setTitle', [$title]);
+
+        return parent::setTitle($title);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getTitle()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getTitle', []);
+
+        return parent::getTitle();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setSubtitle($subtitle)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setSubtitle', [$subtitle]);
+
+        return parent::setSubtitle($subtitle);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getSubtitle()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getSubtitle', []);
+
+        return parent::getSubtitle();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setAuthorName($authorName)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setAuthorName', [$authorName]);
+
+        return parent::setAuthorName($authorName);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getAuthorName()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getAuthorName', []);
+
+        return parent::getAuthorName();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setAuthorEmail($authorEmail)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setAuthorEmail', [$authorEmail]);
+
+        return parent::setAuthorEmail($authorEmail);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getAuthorEmail()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getAuthorEmail', []);
+
+        return parent::getAuthorEmail();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setCreatedOn($createdOn)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreatedOn', [$createdOn]);
+
+        return parent::setCreatedOn($createdOn);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCreatedOn()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreatedOn', []);
+
+        return parent::getCreatedOn();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setUpdatedOn($updatedOn)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUpdatedOn', [$updatedOn]);
+
+        return parent::setUpdatedOn($updatedOn);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getUpdatedOn()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUpdatedOn', []);
+
+        return parent::getUpdatedOn();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function addItem(\Alchemy\Phrasea\Model\Entities\FeedItem $items)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'addItem', [$items]);
+
+        return parent::addItem($items);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function removeItem(\Alchemy\Phrasea\Model\Entities\FeedItem $items)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'removeItem', [$items]);
+
+        return parent::removeItem($items);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getItems()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getItems', []);
+
+        return parent::getItems();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setPublisher(\Alchemy\Phrasea\Model\Entities\FeedPublisher $publisher = NULL)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setPublisher', [$publisher]);
+
+        return parent::setPublisher($publisher);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getPublisher()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getPublisher', []);
+
+        return parent::getPublisher();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setFeed(\Alchemy\Phrasea\Model\Entities\Feed $feed = NULL)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setFeed', [$feed]);
+
+        return parent::setFeed($feed);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getFeed()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getFeed', []);
+
+        return parent::getFeed();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function isPublisher(\Alchemy\Phrasea\Model\Entities\User $user)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'isPublisher', [$user]);
+
+        return parent::isPublisher($user);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getItem($id)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getItem', [$id]);
+
+        return parent::getItem($id);
+    }
+
+}
--- a/resources/proxies/CGAlchemyPhraseaModelEntitiesFeedItem.php
+++ b/resources/proxies/CGAlchemyPhraseaModelEntitiesFeedItem.php
@@ -0,0 +1,345 @@
+<?php
+
+namespace Alchemy\Phrasea\Model\Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
+
+/**
+ * DO NOT EDIT THIS FILE - IT WAS CREATED BY DOCTRINE'S PROXY GENERATOR
+ */
+class FeedItem extends \Alchemy\Phrasea\Model\Entities\FeedItem implements \Doctrine\ORM\Proxy\Proxy
+{
+    /**
+     * @var \Closure the callback responsible for loading properties in the proxy object. This callback is called with
+     *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
+     *      initialization process and an array of ordered parameters that were passed to that method.
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     */
+    public $__initializer__;
+
+    /**
+     * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     */
+    public $__cloner__;
+
+    /**
+     * @var boolean flag indicating if this object was already initialized
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__isInitialized
+     */
+    public $__isInitialized__ = false;
+
+    /**
+     * @var array properties to be lazy loaded, with keys being the property
+     *            names and values being their default values
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     */
+    public static $lazyPropertiesDefaults = [];
+
+
+
+    /**
+     * @param \Closure $initializer
+     * @param \Closure $cloner
+     */
+    public function __construct($initializer = null, $cloner = null)
+    {
+
+        $this->__initializer__ = $initializer;
+        $this->__cloner__      = $cloner;
+    }
+
+
+
+
+
+
+
+    /**
+     * 
+     * @return array
+     */
+    public function __sleep()
+    {
+        if ($this->__isInitialized__) {
+            return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedItem' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedItem' . "\0" . 'recordId', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedItem' . "\0" . 'sbasId', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedItem' . "\0" . 'ord', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedItem' . "\0" . 'createdOn', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedItem' . "\0" . 'updatedOn', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedItem' . "\0" . 'entry'];
+        }
+
+        return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedItem' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedItem' . "\0" . 'recordId', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedItem' . "\0" . 'sbasId', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedItem' . "\0" . 'ord', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedItem' . "\0" . 'createdOn', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedItem' . "\0" . 'updatedOn', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedItem' . "\0" . 'entry'];
+    }
+
+    /**
+     * 
+     */
+    public function __wakeup()
+    {
+        if ( ! $this->__isInitialized__) {
+            $this->__initializer__ = function (FeedItem $proxy) {
+                $proxy->__setInitializer(null);
+                $proxy->__setCloner(null);
+
+                $existingProperties = get_object_vars($proxy);
+
+                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                    if ( ! array_key_exists($property, $existingProperties)) {
+                        $proxy->$property = $defaultValue;
+                    }
+                }
+            };
+
+        }
+    }
+
+    /**
+     * 
+     */
+    public function __clone()
+    {
+        $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', []);
+    }
+
+    /**
+     * Forces initialization of the proxy
+     */
+    public function __load()
+    {
+        $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', []);
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __isInitialized()
+    {
+        return $this->__isInitialized__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitialized($initialized)
+    {
+        $this->__isInitialized__ = $initialized;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitializer(\Closure $initializer = null)
+    {
+        $this->__initializer__ = $initializer;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __getInitializer()
+    {
+        return $this->__initializer__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setCloner(\Closure $cloner = null)
+    {
+        $this->__cloner__ = $cloner;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific cloning logic
+     */
+    public function __getCloner()
+    {
+        return $this->__cloner__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @static
+     */
+    public function __getLazyProperties()
+    {
+        return self::$lazyPropertiesDefaults;
+    }
+
+    
+    /**
+     * {@inheritDoc}
+     */
+    public function getId()
+    {
+        if ($this->__isInitialized__ === false) {
+            return (int)  parent::getId();
+        }
+
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', []);
+
+        return parent::getId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setRecordId($recordId)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setRecordId', [$recordId]);
+
+        return parent::setRecordId($recordId);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getRecordId()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getRecordId', []);
+
+        return parent::getRecordId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setSbasId($sbasId)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setSbasId', [$sbasId]);
+
+        return parent::setSbasId($sbasId);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getSbasId()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getSbasId', []);
+
+        return parent::getSbasId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setEntry(\Alchemy\Phrasea\Model\Entities\FeedEntry $entry = NULL)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setEntry', [$entry]);
+
+        return parent::setEntry($entry);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getEntry()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getEntry', []);
+
+        return parent::getEntry();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setOrd($ord)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setOrd', [$ord]);
+
+        return parent::setOrd($ord);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getOrd()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getOrd', []);
+
+        return parent::getOrd();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setCreatedOn($createdOn)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreatedOn', [$createdOn]);
+
+        return parent::setCreatedOn($createdOn);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCreatedOn()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreatedOn', []);
+
+        return parent::getCreatedOn();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setUpdatedOn($updatedOn)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUpdatedOn', [$updatedOn]);
+
+        return parent::setUpdatedOn($updatedOn);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getUpdatedOn()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUpdatedOn', []);
+
+        return parent::getUpdatedOn();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setLastInFeedItem()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setLastInFeedItem', []);
+
+        return parent::setLastInFeedItem();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getRecord(\Alchemy\Phrasea\Application $app)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getRecord', [$app]);
+
+        return parent::getRecord($app);
+    }
+
+}
--- a/resources/proxies/CGAlchemyPhraseaModelEntitiesFeedPublisher.php
+++ b/resources/proxies/CGAlchemyPhraseaModelEntitiesFeedPublisher.php
@@ -0,0 +1,279 @@
+<?php
+
+namespace Alchemy\Phrasea\Model\Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
+
+/**
+ * DO NOT EDIT THIS FILE - IT WAS CREATED BY DOCTRINE'S PROXY GENERATOR
+ */
+class FeedPublisher extends \Alchemy\Phrasea\Model\Entities\FeedPublisher implements \Doctrine\ORM\Proxy\Proxy
+{
+    /**
+     * @var \Closure the callback responsible for loading properties in the proxy object. This callback is called with
+     *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
+     *      initialization process and an array of ordered parameters that were passed to that method.
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     */
+    public $__initializer__;
+
+    /**
+     * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     */
+    public $__cloner__;
+
+    /**
+     * @var boolean flag indicating if this object was already initialized
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__isInitialized
+     */
+    public $__isInitialized__ = false;
+
+    /**
+     * @var array properties to be lazy loaded, with keys being the property
+     *            names and values being their default values
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     */
+    public static $lazyPropertiesDefaults = [];
+
+
+
+    /**
+     * @param \Closure $initializer
+     * @param \Closure $cloner
+     */
+    public function __construct($initializer = null, $cloner = null)
+    {
+
+        $this->__initializer__ = $initializer;
+        $this->__cloner__      = $cloner;
+    }
+
+
+
+
+
+
+
+    /**
+     * 
+     * @return array
+     */
+    public function __sleep()
+    {
+        if ($this->__isInitialized__) {
+            return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedPublisher' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedPublisher' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedPublisher' . "\0" . 'owner', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedPublisher' . "\0" . 'createdOn', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedPublisher' . "\0" . 'feed'];
+        }
+
+        return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedPublisher' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedPublisher' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedPublisher' . "\0" . 'owner', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedPublisher' . "\0" . 'createdOn', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedPublisher' . "\0" . 'feed'];
+    }
+
+    /**
+     * 
+     */
+    public function __wakeup()
+    {
+        if ( ! $this->__isInitialized__) {
+            $this->__initializer__ = function (FeedPublisher $proxy) {
+                $proxy->__setInitializer(null);
+                $proxy->__setCloner(null);
+
+                $existingProperties = get_object_vars($proxy);
+
+                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                    if ( ! array_key_exists($property, $existingProperties)) {
+                        $proxy->$property = $defaultValue;
+                    }
+                }
+            };
+
+        }
+    }
+
+    /**
+     * 
+     */
+    public function __clone()
+    {
+        $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', []);
+    }
+
+    /**
+     * Forces initialization of the proxy
+     */
+    public function __load()
+    {
+        $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', []);
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __isInitialized()
+    {
+        return $this->__isInitialized__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitialized($initialized)
+    {
+        $this->__isInitialized__ = $initialized;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitializer(\Closure $initializer = null)
+    {
+        $this->__initializer__ = $initializer;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __getInitializer()
+    {
+        return $this->__initializer__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setCloner(\Closure $cloner = null)
+    {
+        $this->__cloner__ = $cloner;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific cloning logic
+     */
+    public function __getCloner()
+    {
+        return $this->__cloner__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @static
+     */
+    public function __getLazyProperties()
+    {
+        return self::$lazyPropertiesDefaults;
+    }
+
+    
+    /**
+     * {@inheritDoc}
+     */
+    public function getId()
+    {
+        if ($this->__isInitialized__ === false) {
+            return (int)  parent::getId();
+        }
+
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', []);
+
+        return parent::getId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setUser(\Alchemy\Phrasea\Model\Entities\User $user)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUser', [$user]);
+
+        return parent::setUser($user);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getUser()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUser', []);
+
+        return parent::getUser();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setIsOwner($owner)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setIsOwner', [$owner]);
+
+        return parent::setIsOwner($owner);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function isOwner()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'isOwner', []);
+
+        return parent::isOwner();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setFeed(\Alchemy\Phrasea\Model\Entities\Feed $feed = NULL)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setFeed', [$feed]);
+
+        return parent::setFeed($feed);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getFeed()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getFeed', []);
+
+        return parent::getFeed();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setCreatedOn($createdOn)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreatedOn', [$createdOn]);
+
+        return parent::setCreatedOn($createdOn);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCreatedOn()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreatedOn', []);
+
+        return parent::getCreatedOn();
+    }
+
+}
--- a/resources/proxies/CGAlchemyPhraseaModelEntitiesFeedToken.php
+++ b/resources/proxies/CGAlchemyPhraseaModelEntitiesFeedToken.php
@@ -0,0 +1,257 @@
+<?php
+
+namespace Alchemy\Phrasea\Model\Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
+
+/**
+ * DO NOT EDIT THIS FILE - IT WAS CREATED BY DOCTRINE'S PROXY GENERATOR
+ */
+class FeedToken extends \Alchemy\Phrasea\Model\Entities\FeedToken implements \Doctrine\ORM\Proxy\Proxy
+{
+    /**
+     * @var \Closure the callback responsible for loading properties in the proxy object. This callback is called with
+     *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
+     *      initialization process and an array of ordered parameters that were passed to that method.
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     */
+    public $__initializer__;
+
+    /**
+     * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     */
+    public $__cloner__;
+
+    /**
+     * @var boolean flag indicating if this object was already initialized
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__isInitialized
+     */
+    public $__isInitialized__ = false;
+
+    /**
+     * @var array properties to be lazy loaded, with keys being the property
+     *            names and values being their default values
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     */
+    public static $lazyPropertiesDefaults = [];
+
+
+
+    /**
+     * @param \Closure $initializer
+     * @param \Closure $cloner
+     */
+    public function __construct($initializer = null, $cloner = null)
+    {
+
+        $this->__initializer__ = $initializer;
+        $this->__cloner__      = $cloner;
+    }
+
+
+
+
+
+
+
+    /**
+     * 
+     * @return array
+     */
+    public function __sleep()
+    {
+        if ($this->__isInitialized__) {
+            return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedToken' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedToken' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedToken' . "\0" . 'value', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedToken' . "\0" . 'feed'];
+        }
+
+        return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedToken' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedToken' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedToken' . "\0" . 'value', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedToken' . "\0" . 'feed'];
+    }
+
+    /**
+     * 
+     */
+    public function __wakeup()
+    {
+        if ( ! $this->__isInitialized__) {
+            $this->__initializer__ = function (FeedToken $proxy) {
+                $proxy->__setInitializer(null);
+                $proxy->__setCloner(null);
+
+                $existingProperties = get_object_vars($proxy);
+
+                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                    if ( ! array_key_exists($property, $existingProperties)) {
+                        $proxy->$property = $defaultValue;
+                    }
+                }
+            };
+
+        }
+    }
+
+    /**
+     * 
+     */
+    public function __clone()
+    {
+        $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', []);
+    }
+
+    /**
+     * Forces initialization of the proxy
+     */
+    public function __load()
+    {
+        $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', []);
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __isInitialized()
+    {
+        return $this->__isInitialized__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitialized($initialized)
+    {
+        $this->__isInitialized__ = $initialized;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitializer(\Closure $initializer = null)
+    {
+        $this->__initializer__ = $initializer;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __getInitializer()
+    {
+        return $this->__initializer__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setCloner(\Closure $cloner = null)
+    {
+        $this->__cloner__ = $cloner;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific cloning logic
+     */
+    public function __getCloner()
+    {
+        return $this->__cloner__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @static
+     */
+    public function __getLazyProperties()
+    {
+        return self::$lazyPropertiesDefaults;
+    }
+
+    
+    /**
+     * {@inheritDoc}
+     */
+    public function getId()
+    {
+        if ($this->__isInitialized__ === false) {
+            return (int)  parent::getId();
+        }
+
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', []);
+
+        return parent::getId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setUser(\Alchemy\Phrasea\Model\Entities\User $user)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUser', [$user]);
+
+        return parent::setUser($user);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getUser()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUser', []);
+
+        return parent::getUser();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setFeed(\Alchemy\Phrasea\Model\Entities\Feed $feed = NULL)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setFeed', [$feed]);
+
+        return parent::setFeed($feed);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getFeed()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getFeed', []);
+
+        return parent::getFeed();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setValue($value)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setValue', [$value]);
+
+        return parent::setValue($value);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getValue()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getValue', []);
+
+        return parent::getValue();
+    }
+
+}
--- a/resources/proxies/CGAlchemyPhraseaModelEntitiesFtpCredential.php
+++ b/resources/proxies/CGAlchemyPhraseaModelEntitiesFtpCredential.php
@@ -0,0 +1,433 @@
+<?php
+
+namespace Alchemy\Phrasea\Model\Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
+
+/**
+ * DO NOT EDIT THIS FILE - IT WAS CREATED BY DOCTRINE'S PROXY GENERATOR
+ */
+class FtpCredential extends \Alchemy\Phrasea\Model\Entities\FtpCredential implements \Doctrine\ORM\Proxy\Proxy
+{
+    /**
+     * @var \Closure the callback responsible for loading properties in the proxy object. This callback is called with
+     *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
+     *      initialization process and an array of ordered parameters that were passed to that method.
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     */
+    public $__initializer__;
+
+    /**
+     * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     */
+    public $__cloner__;
+
+    /**
+     * @var boolean flag indicating if this object was already initialized
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__isInitialized
+     */
+    public $__isInitialized__ = false;
+
+    /**
+     * @var array properties to be lazy loaded, with keys being the property
+     *            names and values being their default values
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     */
+    public static $lazyPropertiesDefaults = [];
+
+
+
+    /**
+     * @param \Closure $initializer
+     * @param \Closure $cloner
+     */
+    public function __construct($initializer = null, $cloner = null)
+    {
+
+        $this->__initializer__ = $initializer;
+        $this->__cloner__      = $cloner;
+    }
+
+
+
+
+
+
+
+    /**
+     * 
+     * @return array
+     */
+    public function __sleep()
+    {
+        if ($this->__isInitialized__) {
+            return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpCredential' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpCredential' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpCredential' . "\0" . 'active', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpCredential' . "\0" . 'address', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpCredential' . "\0" . 'login', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpCredential' . "\0" . 'password', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpCredential' . "\0" . 'receptionFolder', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpCredential' . "\0" . 'repositoryPrefixName', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpCredential' . "\0" . 'passive', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpCredential' . "\0" . 'ssl', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpCredential' . "\0" . 'maxRetry', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpCredential' . "\0" . 'updated'];
+        }
+
+        return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpCredential' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpCredential' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpCredential' . "\0" . 'active', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpCredential' . "\0" . 'address', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpCredential' . "\0" . 'login', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpCredential' . "\0" . 'password', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpCredential' . "\0" . 'receptionFolder', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpCredential' . "\0" . 'repositoryPrefixName', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpCredential' . "\0" . 'passive', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpCredential' . "\0" . 'ssl', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpCredential' . "\0" . 'maxRetry', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpCredential' . "\0" . 'updated'];
+    }
+
+    /**
+     * 
+     */
+    public function __wakeup()
+    {
+        if ( ! $this->__isInitialized__) {
+            $this->__initializer__ = function (FtpCredential $proxy) {
+                $proxy->__setInitializer(null);
+                $proxy->__setCloner(null);
+
+                $existingProperties = get_object_vars($proxy);
+
+                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                    if ( ! array_key_exists($property, $existingProperties)) {
+                        $proxy->$property = $defaultValue;
+                    }
+                }
+            };
+
+        }
+    }
+
+    /**
+     * 
+     */
+    public function __clone()
+    {
+        $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', []);
+    }
+
+    /**
+     * Forces initialization of the proxy
+     */
+    public function __load()
+    {
+        $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', []);
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __isInitialized()
+    {
+        return $this->__isInitialized__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitialized($initialized)
+    {
+        $this->__isInitialized__ = $initialized;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitializer(\Closure $initializer = null)
+    {
+        $this->__initializer__ = $initializer;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __getInitializer()
+    {
+        return $this->__initializer__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setCloner(\Closure $cloner = null)
+    {
+        $this->__cloner__ = $cloner;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific cloning logic
+     */
+    public function __getCloner()
+    {
+        return $this->__cloner__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @static
+     */
+    public function __getLazyProperties()
+    {
+        return self::$lazyPropertiesDefaults;
+    }
+
+    
+    /**
+     * {@inheritDoc}
+     */
+    public function getId()
+    {
+        if ($this->__isInitialized__ === false) {
+            return (int)  parent::getId();
+        }
+
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', []);
+
+        return parent::getId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getUser()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUser', []);
+
+        return parent::getUser();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setUser(\Alchemy\Phrasea\Model\Entities\User $user)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUser', [$user]);
+
+        return parent::setUser($user);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function isActive()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'isActive', []);
+
+        return parent::isActive();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setActive($active)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setActive', [$active]);
+
+        return parent::setActive($active);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getAddress()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getAddress', []);
+
+        return parent::getAddress();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setAddress($address)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setAddress', [$address]);
+
+        return parent::setAddress($address);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getLogin()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getLogin', []);
+
+        return parent::getLogin();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setLogin($login)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setLogin', [$login]);
+
+        return parent::setLogin($login);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getPassword()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getPassword', []);
+
+        return parent::getPassword();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setPassword($password)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setPassword', [$password]);
+
+        return parent::setPassword($password);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getReceptionFolder()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getReceptionFolder', []);
+
+        return parent::getReceptionFolder();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setReceptionFolder($receptionFolder)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setReceptionFolder', [$receptionFolder]);
+
+        return parent::setReceptionFolder($receptionFolder);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getRepositoryPrefixName()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getRepositoryPrefixName', []);
+
+        return parent::getRepositoryPrefixName();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setRepositoryPrefixName($repositoryPrefixName)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setRepositoryPrefixName', [$repositoryPrefixName]);
+
+        return parent::setRepositoryPrefixName($repositoryPrefixName);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function isPassive()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'isPassive', []);
+
+        return parent::isPassive();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setPassive($passive)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setPassive', [$passive]);
+
+        return parent::setPassive($passive);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function isSsl()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'isSsl', []);
+
+        return parent::isSsl();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setSsl($ssl)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setSsl', [$ssl]);
+
+        return parent::setSsl($ssl);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getMaxRetry()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getMaxRetry', []);
+
+        return parent::getMaxRetry();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setMaxRetry($maxRetry)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setMaxRetry', [$maxRetry]);
+
+        return parent::setMaxRetry($maxRetry);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getUpdated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUpdated', []);
+
+        return parent::getUpdated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setUpdated(\DateTime $updated)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUpdated', [$updated]);
+
+        return parent::setUpdated($updated);
+    }
+
+}
--- a/resources/proxies/CGAlchemyPhraseaModelEntitiesFtpExport.php
+++ b/resources/proxies/CGAlchemyPhraseaModelEntitiesFtpExport.php
@@ -0,0 +1,609 @@
+<?php
+
+namespace Alchemy\Phrasea\Model\Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
+
+/**
+ * DO NOT EDIT THIS FILE - IT WAS CREATED BY DOCTRINE'S PROXY GENERATOR
+ */
+class FtpExport extends \Alchemy\Phrasea\Model\Entities\FtpExport implements \Doctrine\ORM\Proxy\Proxy
+{
+    /**
+     * @var \Closure the callback responsible for loading properties in the proxy object. This callback is called with
+     *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
+     *      initialization process and an array of ordered parameters that were passed to that method.
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     */
+    public $__initializer__;
+
+    /**
+     * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     */
+    public $__cloner__;
+
+    /**
+     * @var boolean flag indicating if this object was already initialized
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__isInitialized
+     */
+    public $__isInitialized__ = false;
+
+    /**
+     * @var array properties to be lazy loaded, with keys being the property
+     *            names and values being their default values
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     */
+    public static $lazyPropertiesDefaults = [];
+
+
+
+    /**
+     * @param \Closure $initializer
+     * @param \Closure $cloner
+     */
+    public function __construct($initializer = null, $cloner = null)
+    {
+
+        $this->__initializer__ = $initializer;
+        $this->__cloner__      = $cloner;
+    }
+
+
+
+
+
+
+
+    /**
+     * 
+     * @return array
+     */
+    public function __sleep()
+    {
+        if ($this->__isInitialized__) {
+            return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'crash', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'nbretry', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'mail', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'addr', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'ssl', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'login', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'pwd', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'passif', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'destfolder', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'sendermail', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'textMailSender', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'textMailReceiver', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'foldertocreate', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'logfile', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'elements', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'updated'];
+        }
+
+        return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'crash', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'nbretry', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'mail', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'addr', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'ssl', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'login', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'pwd', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'passif', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'destfolder', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'sendermail', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'textMailSender', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'textMailReceiver', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'foldertocreate', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'logfile', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'elements', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'updated'];
+    }
+
+    /**
+     * 
+     */
+    public function __wakeup()
+    {
+        if ( ! $this->__isInitialized__) {
+            $this->__initializer__ = function (FtpExport $proxy) {
+                $proxy->__setInitializer(null);
+                $proxy->__setCloner(null);
+
+                $existingProperties = get_object_vars($proxy);
+
+                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                    if ( ! array_key_exists($property, $existingProperties)) {
+                        $proxy->$property = $defaultValue;
+                    }
+                }
+            };
+
+        }
+    }
+
+    /**
+     * 
+     */
+    public function __clone()
+    {
+        $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', []);
+    }
+
+    /**
+     * Forces initialization of the proxy
+     */
+    public function __load()
+    {
+        $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', []);
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __isInitialized()
+    {
+        return $this->__isInitialized__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitialized($initialized)
+    {
+        $this->__isInitialized__ = $initialized;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitializer(\Closure $initializer = null)
+    {
+        $this->__initializer__ = $initializer;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __getInitializer()
+    {
+        return $this->__initializer__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setCloner(\Closure $cloner = null)
+    {
+        $this->__cloner__ = $cloner;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific cloning logic
+     */
+    public function __getCloner()
+    {
+        return $this->__cloner__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @static
+     */
+    public function __getLazyProperties()
+    {
+        return self::$lazyPropertiesDefaults;
+    }
+
+    
+    /**
+     * {@inheritDoc}
+     */
+    public function getId()
+    {
+        if ($this->__isInitialized__ === false) {
+            return (int)  parent::getId();
+        }
+
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', []);
+
+        return parent::getId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setUser(\Alchemy\Phrasea\Model\Entities\User $user)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUser', [$user]);
+
+        return parent::setUser($user);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getUser()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUser', []);
+
+        return parent::getUser();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setCrash($crash)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCrash', [$crash]);
+
+        return parent::setCrash($crash);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCrash()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCrash', []);
+
+        return parent::getCrash();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function incrementCrash()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'incrementCrash', []);
+
+        return parent::incrementCrash();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setNbretry($nbretry)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setNbretry', [$nbretry]);
+
+        return parent::setNbretry($nbretry);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getNbretry()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getNbretry', []);
+
+        return parent::getNbretry();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setMail($mail)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setMail', [$mail]);
+
+        return parent::setMail($mail);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getMail()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getMail', []);
+
+        return parent::getMail();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setAddr($addr)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setAddr', [$addr]);
+
+        return parent::setAddr($addr);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getAddr()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getAddr', []);
+
+        return parent::getAddr();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setSsl($ssl)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setSsl', [$ssl]);
+
+        return parent::setSsl($ssl);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function isSsl()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'isSsl', []);
+
+        return parent::isSsl();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setLogin($login)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setLogin', [$login]);
+
+        return parent::setLogin($login);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getLogin()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getLogin', []);
+
+        return parent::getLogin();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setPwd($pwd)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setPwd', [$pwd]);
+
+        return parent::setPwd($pwd);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getPwd()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getPwd', []);
+
+        return parent::getPwd();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setPassif($passif)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setPassif', [$passif]);
+
+        return parent::setPassif($passif);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function isPassif()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'isPassif', []);
+
+        return parent::isPassif();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setDestfolder($destfolder)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setDestfolder', [$destfolder]);
+
+        return parent::setDestfolder($destfolder);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getDestfolder()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getDestfolder', []);
+
+        return parent::getDestfolder();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setSendermail($sendermail)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setSendermail', [$sendermail]);
+
+        return parent::setSendermail($sendermail);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getSendermail()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getSendermail', []);
+
+        return parent::getSendermail();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setTextMailSender($textMailSender)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setTextMailSender', [$textMailSender]);
+
+        return parent::setTextMailSender($textMailSender);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getTextMailSender()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getTextMailSender', []);
+
+        return parent::getTextMailSender();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setTextMailReceiver($textMailReceiver)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setTextMailReceiver', [$textMailReceiver]);
+
+        return parent::setTextMailReceiver($textMailReceiver);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getTextMailReceiver()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getTextMailReceiver', []);
+
+        return parent::getTextMailReceiver();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setFoldertocreate($foldertocreate)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setFoldertocreate', [$foldertocreate]);
+
+        return parent::setFoldertocreate($foldertocreate);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getFoldertocreate()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getFoldertocreate', []);
+
+        return parent::getFoldertocreate();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setLogfile($logfile)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setLogfile', [$logfile]);
+
+        return parent::setLogfile($logfile);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function isLogfile()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'isLogfile', []);
+
+        return parent::isLogfile();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setCreated(\DateTime $created)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreated', [$created]);
+
+        return parent::setCreated($created);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCreated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreated', []);
+
+        return parent::getCreated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setUpdated(\DateTime $updated)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUpdated', [$updated]);
+
+        return parent::setUpdated($updated);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getUpdated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUpdated', []);
+
+        return parent::getUpdated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function addElement(\Alchemy\Phrasea\Model\Entities\FtpExportElement $elements)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'addElement', [$elements]);
+
+        return parent::addElement($elements);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function removeElement(\Alchemy\Phrasea\Model\Entities\FtpExportElement $elements)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'removeElement', [$elements]);
+
+        return parent::removeElement($elements);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getElements()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getElements', []);
+
+        return parent::getElements();
+    }
+
+}
--- a/resources/proxies/CGAlchemyPhraseaModelEntitiesFtpExportElement.php
+++ b/resources/proxies/CGAlchemyPhraseaModelEntitiesFtpExportElement.php
@@ -0,0 +1,433 @@
+<?php
+
+namespace Alchemy\Phrasea\Model\Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
+
+/**
+ * DO NOT EDIT THIS FILE - IT WAS CREATED BY DOCTRINE'S PROXY GENERATOR
+ */
+class FtpExportElement extends \Alchemy\Phrasea\Model\Entities\FtpExportElement implements \Doctrine\ORM\Proxy\Proxy
+{
+    /**
+     * @var \Closure the callback responsible for loading properties in the proxy object. This callback is called with
+     *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
+     *      initialization process and an array of ordered parameters that were passed to that method.
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     */
+    public $__initializer__;
+
+    /**
+     * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     */
+    public $__cloner__;
+
+    /**
+     * @var boolean flag indicating if this object was already initialized
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__isInitialized
+     */
+    public $__isInitialized__ = false;
+
+    /**
+     * @var array properties to be lazy loaded, with keys being the property
+     *            names and values being their default values
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     */
+    public static $lazyPropertiesDefaults = [];
+
+
+
+    /**
+     * @param \Closure $initializer
+     * @param \Closure $cloner
+     */
+    public function __construct($initializer = null, $cloner = null)
+    {
+
+        $this->__initializer__ = $initializer;
+        $this->__cloner__      = $cloner;
+    }
+
+
+
+
+
+
+
+    /**
+     * 
+     * @return array
+     */
+    public function __sleep()
+    {
+        if ($this->__isInitialized__) {
+            return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExportElement' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExportElement' . "\0" . 'recordId', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExportElement' . "\0" . 'baseId', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExportElement' . "\0" . 'subdef', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExportElement' . "\0" . 'filename', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExportElement' . "\0" . 'folder', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExportElement' . "\0" . 'error', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExportElement' . "\0" . 'done', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExportElement' . "\0" . 'export', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExportElement' . "\0" . 'businessfields', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExportElement' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExportElement' . "\0" . 'updated'];
+        }
+
+        return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExportElement' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExportElement' . "\0" . 'recordId', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExportElement' . "\0" . 'baseId', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExportElement' . "\0" . 'subdef', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExportElement' . "\0" . 'filename', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExportElement' . "\0" . 'folder', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExportElement' . "\0" . 'error', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExportElement' . "\0" . 'done', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExportElement' . "\0" . 'export', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExportElement' . "\0" . 'businessfields', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExportElement' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExportElement' . "\0" . 'updated'];
+    }
+
+    /**
+     * 
+     */
+    public function __wakeup()
+    {
+        if ( ! $this->__isInitialized__) {
+            $this->__initializer__ = function (FtpExportElement $proxy) {
+                $proxy->__setInitializer(null);
+                $proxy->__setCloner(null);
+
+                $existingProperties = get_object_vars($proxy);
+
+                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                    if ( ! array_key_exists($property, $existingProperties)) {
+                        $proxy->$property = $defaultValue;
+                    }
+                }
+            };
+
+        }
+    }
+
+    /**
+     * 
+     */
+    public function __clone()
+    {
+        $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', []);
+    }
+
+    /**
+     * Forces initialization of the proxy
+     */
+    public function __load()
+    {
+        $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', []);
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __isInitialized()
+    {
+        return $this->__isInitialized__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitialized($initialized)
+    {
+        $this->__isInitialized__ = $initialized;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitializer(\Closure $initializer = null)
+    {
+        $this->__initializer__ = $initializer;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __getInitializer()
+    {
+        return $this->__initializer__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setCloner(\Closure $cloner = null)
+    {
+        $this->__cloner__ = $cloner;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific cloning logic
+     */
+    public function __getCloner()
+    {
+        return $this->__cloner__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @static
+     */
+    public function __getLazyProperties()
+    {
+        return self::$lazyPropertiesDefaults;
+    }
+
+    
+    /**
+     * {@inheritDoc}
+     */
+    public function getId()
+    {
+        if ($this->__isInitialized__ === false) {
+            return (int)  parent::getId();
+        }
+
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', []);
+
+        return parent::getId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setRecordId($recordId)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setRecordId', [$recordId]);
+
+        return parent::setRecordId($recordId);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getRecordId()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getRecordId', []);
+
+        return parent::getRecordId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setBaseId($baseId)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setBaseId', [$baseId]);
+
+        return parent::setBaseId($baseId);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getBaseId()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getBaseId', []);
+
+        return parent::getBaseId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setSubdef($subdef)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setSubdef', [$subdef]);
+
+        return parent::setSubdef($subdef);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getSubdef()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getSubdef', []);
+
+        return parent::getSubdef();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setFilename($filename)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setFilename', [$filename]);
+
+        return parent::setFilename($filename);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getFilename()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getFilename', []);
+
+        return parent::getFilename();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setFolder($folder)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setFolder', [$folder]);
+
+        return parent::setFolder($folder);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getFolder()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getFolder', []);
+
+        return parent::getFolder();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setError($error)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setError', [$error]);
+
+        return parent::setError($error);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function isError()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'isError', []);
+
+        return parent::isError();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setDone($done)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setDone', [$done]);
+
+        return parent::setDone($done);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function isDone()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'isDone', []);
+
+        return parent::isDone();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setBusinessfields($businessfields)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setBusinessfields', [$businessfields]);
+
+        return parent::setBusinessfields($businessfields);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function isBusinessfields()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'isBusinessfields', []);
+
+        return parent::isBusinessfields();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setCreated(\DateTime $created)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreated', [$created]);
+
+        return parent::setCreated($created);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCreated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreated', []);
+
+        return parent::getCreated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setUpdated(\DateTime $updated)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUpdated', [$updated]);
+
+        return parent::setUpdated($updated);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getUpdated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUpdated', []);
+
+        return parent::getUpdated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setExport(\Alchemy\Phrasea\Model\Entities\FtpExport $export = NULL)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setExport', [$export]);
+
+        return parent::setExport($export);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getExport()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getExport', []);
+
+        return parent::getExport();
+    }
+
+}
--- a/resources/proxies/CGAlchemyPhraseaModelEntitiesLazaretAttribute.php
+++ b/resources/proxies/CGAlchemyPhraseaModelEntitiesLazaretAttribute.php
@@ -0,0 +1,301 @@
+<?php
+
+namespace Alchemy\Phrasea\Model\Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
+
+/**
+ * DO NOT EDIT THIS FILE - IT WAS CREATED BY DOCTRINE'S PROXY GENERATOR
+ */
+class LazaretAttribute extends \Alchemy\Phrasea\Model\Entities\LazaretAttribute implements \Doctrine\ORM\Proxy\Proxy
+{
+    /**
+     * @var \Closure the callback responsible for loading properties in the proxy object. This callback is called with
+     *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
+     *      initialization process and an array of ordered parameters that were passed to that method.
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     */
+    public $__initializer__;
+
+    /**
+     * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     */
+    public $__cloner__;
+
+    /**
+     * @var boolean flag indicating if this object was already initialized
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__isInitialized
+     */
+    public $__isInitialized__ = false;
+
+    /**
+     * @var array properties to be lazy loaded, with keys being the property
+     *            names and values being their default values
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     */
+    public static $lazyPropertiesDefaults = [];
+
+
+
+    /**
+     * @param \Closure $initializer
+     * @param \Closure $cloner
+     */
+    public function __construct($initializer = null, $cloner = null)
+    {
+
+        $this->__initializer__ = $initializer;
+        $this->__cloner__      = $cloner;
+    }
+
+
+
+
+
+
+
+    /**
+     * 
+     * @return array
+     */
+    public function __sleep()
+    {
+        if ($this->__isInitialized__) {
+            return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretAttribute' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretAttribute' . "\0" . 'name', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretAttribute' . "\0" . 'value', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretAttribute' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretAttribute' . "\0" . 'updated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretAttribute' . "\0" . 'lazaretFile'];
+        }
+
+        return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretAttribute' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretAttribute' . "\0" . 'name', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretAttribute' . "\0" . 'value', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretAttribute' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretAttribute' . "\0" . 'updated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretAttribute' . "\0" . 'lazaretFile'];
+    }
+
+    /**
+     * 
+     */
+    public function __wakeup()
+    {
+        if ( ! $this->__isInitialized__) {
+            $this->__initializer__ = function (LazaretAttribute $proxy) {
+                $proxy->__setInitializer(null);
+                $proxy->__setCloner(null);
+
+                $existingProperties = get_object_vars($proxy);
+
+                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                    if ( ! array_key_exists($property, $existingProperties)) {
+                        $proxy->$property = $defaultValue;
+                    }
+                }
+            };
+
+        }
+    }
+
+    /**
+     * 
+     */
+    public function __clone()
+    {
+        $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', []);
+    }
+
+    /**
+     * Forces initialization of the proxy
+     */
+    public function __load()
+    {
+        $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', []);
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __isInitialized()
+    {
+        return $this->__isInitialized__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitialized($initialized)
+    {
+        $this->__isInitialized__ = $initialized;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitializer(\Closure $initializer = null)
+    {
+        $this->__initializer__ = $initializer;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __getInitializer()
+    {
+        return $this->__initializer__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setCloner(\Closure $cloner = null)
+    {
+        $this->__cloner__ = $cloner;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific cloning logic
+     */
+    public function __getCloner()
+    {
+        return $this->__cloner__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @static
+     */
+    public function __getLazyProperties()
+    {
+        return self::$lazyPropertiesDefaults;
+    }
+
+    
+    /**
+     * {@inheritDoc}
+     */
+    public function getId()
+    {
+        if ($this->__isInitialized__ === false) {
+            return (int)  parent::getId();
+        }
+
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', []);
+
+        return parent::getId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setName($name)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setName', [$name]);
+
+        return parent::setName($name);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getName()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getName', []);
+
+        return parent::getName();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setValue($value)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setValue', [$value]);
+
+        return parent::setValue($value);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getValue()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getValue', []);
+
+        return parent::getValue();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setCreated(\DateTime $created)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreated', [$created]);
+
+        return parent::setCreated($created);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCreated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreated', []);
+
+        return parent::getCreated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setUpdated(\DateTime $updated)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUpdated', [$updated]);
+
+        return parent::setUpdated($updated);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getUpdated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUpdated', []);
+
+        return parent::getUpdated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setLazaretFile(\Alchemy\Phrasea\Model\Entities\LazaretFile $lazaretFile = NULL)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setLazaretFile', [$lazaretFile]);
+
+        return parent::setLazaretFile($lazaretFile);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getLazaretFile()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getLazaretFile', []);
+
+        return parent::getLazaretFile();
+    }
+
+}
--- a/resources/proxies/CGAlchemyPhraseaModelEntitiesLazaretCheck.php
+++ b/resources/proxies/CGAlchemyPhraseaModelEntitiesLazaretCheck.php
@@ -0,0 +1,257 @@
+<?php
+
+namespace Alchemy\Phrasea\Model\Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
+
+/**
+ * DO NOT EDIT THIS FILE - IT WAS CREATED BY DOCTRINE'S PROXY GENERATOR
+ */
+class LazaretCheck extends \Alchemy\Phrasea\Model\Entities\LazaretCheck implements \Doctrine\ORM\Proxy\Proxy
+{
+    /**
+     * @var \Closure the callback responsible for loading properties in the proxy object. This callback is called with
+     *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
+     *      initialization process and an array of ordered parameters that were passed to that method.
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     */
+    public $__initializer__;
+
+    /**
+     * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     */
+    public $__cloner__;
+
+    /**
+     * @var boolean flag indicating if this object was already initialized
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__isInitialized
+     */
+    public $__isInitialized__ = false;
+
+    /**
+     * @var array properties to be lazy loaded, with keys being the property
+     *            names and values being their default values
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     */
+    public static $lazyPropertiesDefaults = [];
+
+
+
+    /**
+     * @param \Closure $initializer
+     * @param \Closure $cloner
+     */
+    public function __construct($initializer = null, $cloner = null)
+    {
+
+        $this->__initializer__ = $initializer;
+        $this->__cloner__      = $cloner;
+    }
+
+
+
+
+
+
+
+    /**
+     * 
+     * @return array
+     */
+    public function __sleep()
+    {
+        if ($this->__isInitialized__) {
+            return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretCheck' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretCheck' . "\0" . 'checkClassname', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretCheck' . "\0" . 'lazaretFile'];
+        }
+
+        return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretCheck' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretCheck' . "\0" . 'checkClassname', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretCheck' . "\0" . 'lazaretFile'];
+    }
+
+    /**
+     * 
+     */
+    public function __wakeup()
+    {
+        if ( ! $this->__isInitialized__) {
+            $this->__initializer__ = function (LazaretCheck $proxy) {
+                $proxy->__setInitializer(null);
+                $proxy->__setCloner(null);
+
+                $existingProperties = get_object_vars($proxy);
+
+                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                    if ( ! array_key_exists($property, $existingProperties)) {
+                        $proxy->$property = $defaultValue;
+                    }
+                }
+            };
+
+        }
+    }
+
+    /**
+     * 
+     */
+    public function __clone()
+    {
+        $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', []);
+    }
+
+    /**
+     * Forces initialization of the proxy
+     */
+    public function __load()
+    {
+        $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', []);
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __isInitialized()
+    {
+        return $this->__isInitialized__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitialized($initialized)
+    {
+        $this->__isInitialized__ = $initialized;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitializer(\Closure $initializer = null)
+    {
+        $this->__initializer__ = $initializer;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __getInitializer()
+    {
+        return $this->__initializer__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setCloner(\Closure $cloner = null)
+    {
+        $this->__cloner__ = $cloner;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific cloning logic
+     */
+    public function __getCloner()
+    {
+        return $this->__cloner__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @static
+     */
+    public function __getLazyProperties()
+    {
+        return self::$lazyPropertiesDefaults;
+    }
+
+    
+    /**
+     * {@inheritDoc}
+     */
+    public function getId()
+    {
+        if ($this->__isInitialized__ === false) {
+            return (int)  parent::getId();
+        }
+
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', []);
+
+        return parent::getId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setCheckClassname($checkClassname)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCheckClassname', [$checkClassname]);
+
+        return parent::setCheckClassname($checkClassname);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCheckClassname()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCheckClassname', []);
+
+        return parent::getCheckClassname();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setLazaretFile(\Alchemy\Phrasea\Model\Entities\LazaretFile $lazaretFile = NULL)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setLazaretFile', [$lazaretFile]);
+
+        return parent::setLazaretFile($lazaretFile);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getLazaretFile()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getLazaretFile', []);
+
+        return parent::getLazaretFile();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getReason(\Symfony\Component\Translation\TranslatorInterface $translator)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getReason', [$translator]);
+
+        return parent::getReason($translator);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function listConflicts(\Alchemy\Phrasea\Application $app)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'listConflicts', [$app]);
+
+        return parent::listConflicts($app);
+    }
+
+}
--- a/resources/proxies/CGAlchemyPhraseaModelEntitiesLazaretFile.php
+++ b/resources/proxies/CGAlchemyPhraseaModelEntitiesLazaretFile.php
@@ -0,0 +1,521 @@
+<?php
+
+namespace Alchemy\Phrasea\Model\Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
+
+/**
+ * DO NOT EDIT THIS FILE - IT WAS CREATED BY DOCTRINE'S PROXY GENERATOR
+ */
+class LazaretFile extends \Alchemy\Phrasea\Model\Entities\LazaretFile implements \Doctrine\ORM\Proxy\Proxy
+{
+    /**
+     * @var \Closure the callback responsible for loading properties in the proxy object. This callback is called with
+     *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
+     *      initialization process and an array of ordered parameters that were passed to that method.
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     */
+    public $__initializer__;
+
+    /**
+     * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     */
+    public $__cloner__;
+
+    /**
+     * @var boolean flag indicating if this object was already initialized
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__isInitialized
+     */
+    public $__isInitialized__ = false;
+
+    /**
+     * @var array properties to be lazy loaded, with keys being the property
+     *            names and values being their default values
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     */
+    public static $lazyPropertiesDefaults = [];
+
+
+
+    /**
+     * @param \Closure $initializer
+     * @param \Closure $cloner
+     */
+    public function __construct($initializer = null, $cloner = null)
+    {
+
+        $this->__initializer__ = $initializer;
+        $this->__cloner__      = $cloner;
+    }
+
+
+
+
+
+
+
+    /**
+     * 
+     * @return array
+     */
+    public function __sleep()
+    {
+        if ($this->__isInitialized__) {
+            return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretFile' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretFile' . "\0" . 'filename', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretFile' . "\0" . 'thumbFilename', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretFile' . "\0" . 'originalName', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretFile' . "\0" . 'base_id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretFile' . "\0" . 'uuid', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretFile' . "\0" . 'sha256', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretFile' . "\0" . 'forced', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretFile' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretFile' . "\0" . 'updated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretFile' . "\0" . 'attributes', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretFile' . "\0" . 'checks', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretFile' . "\0" . 'session'];
+        }
+
+        return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretFile' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretFile' . "\0" . 'filename', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretFile' . "\0" . 'thumbFilename', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretFile' . "\0" . 'originalName', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretFile' . "\0" . 'base_id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretFile' . "\0" . 'uuid', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretFile' . "\0" . 'sha256', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretFile' . "\0" . 'forced', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretFile' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretFile' . "\0" . 'updated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretFile' . "\0" . 'attributes', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretFile' . "\0" . 'checks', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretFile' . "\0" . 'session'];
+    }
+
+    /**
+     * 
+     */
+    public function __wakeup()
+    {
+        if ( ! $this->__isInitialized__) {
+            $this->__initializer__ = function (LazaretFile $proxy) {
+                $proxy->__setInitializer(null);
+                $proxy->__setCloner(null);
+
+                $existingProperties = get_object_vars($proxy);
+
+                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                    if ( ! array_key_exists($property, $existingProperties)) {
+                        $proxy->$property = $defaultValue;
+                    }
+                }
+            };
+
+        }
+    }
+
+    /**
+     * 
+     */
+    public function __clone()
+    {
+        $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', []);
+    }
+
+    /**
+     * Forces initialization of the proxy
+     */
+    public function __load()
+    {
+        $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', []);
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __isInitialized()
+    {
+        return $this->__isInitialized__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitialized($initialized)
+    {
+        $this->__isInitialized__ = $initialized;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitializer(\Closure $initializer = null)
+    {
+        $this->__initializer__ = $initializer;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __getInitializer()
+    {
+        return $this->__initializer__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setCloner(\Closure $cloner = null)
+    {
+        $this->__cloner__ = $cloner;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific cloning logic
+     */
+    public function __getCloner()
+    {
+        return $this->__cloner__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @static
+     */
+    public function __getLazyProperties()
+    {
+        return self::$lazyPropertiesDefaults;
+    }
+
+    
+    /**
+     * {@inheritDoc}
+     */
+    public function getId()
+    {
+        if ($this->__isInitialized__ === false) {
+            return (int)  parent::getId();
+        }
+
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', []);
+
+        return parent::getId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setFilename($filename)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setFilename', [$filename]);
+
+        return parent::setFilename($filename);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getFilename()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getFilename', []);
+
+        return parent::getFilename();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setThumbFilename($thumbFilename)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setThumbFilename', [$thumbFilename]);
+
+        return parent::setThumbFilename($thumbFilename);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getThumbFilename()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getThumbFilename', []);
+
+        return parent::getThumbFilename();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setOriginalName($originalName)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setOriginalName', [$originalName]);
+
+        return parent::setOriginalName($originalName);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getOriginalName()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getOriginalName', []);
+
+        return parent::getOriginalName();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setBaseId($baseId)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setBaseId', [$baseId]);
+
+        return parent::setBaseId($baseId);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getBaseId()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getBaseId', []);
+
+        return parent::getBaseId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCollection(\Alchemy\Phrasea\Application $app)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCollection', [$app]);
+
+        return parent::getCollection($app);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setUuid($uuid)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUuid', [$uuid]);
+
+        return parent::setUuid($uuid);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getUuid()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUuid', []);
+
+        return parent::getUuid();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setSha256($sha256)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setSha256', [$sha256]);
+
+        return parent::setSha256($sha256);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getSha256()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getSha256', []);
+
+        return parent::getSha256();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setForced($forced)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setForced', [$forced]);
+
+        return parent::setForced($forced);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getForced()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getForced', []);
+
+        return parent::getForced();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setCreated(\DateTime $created)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreated', [$created]);
+
+        return parent::setCreated($created);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCreated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreated', []);
+
+        return parent::getCreated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setUpdated(\DateTime $updated)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUpdated', [$updated]);
+
+        return parent::setUpdated($updated);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getUpdated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUpdated', []);
+
+        return parent::getUpdated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function addAttribute(\Alchemy\Phrasea\Model\Entities\LazaretAttribute $attributes)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'addAttribute', [$attributes]);
+
+        return parent::addAttribute($attributes);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function removeAttribute(\Alchemy\Phrasea\Model\Entities\LazaretAttribute $attributes)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'removeAttribute', [$attributes]);
+
+        return parent::removeAttribute($attributes);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getAttributes()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getAttributes', []);
+
+        return parent::getAttributes();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function addCheck(\Alchemy\Phrasea\Model\Entities\LazaretCheck $checks)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'addCheck', [$checks]);
+
+        return parent::addCheck($checks);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function removeCheck(\Alchemy\Phrasea\Model\Entities\LazaretCheck $checks)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'removeCheck', [$checks]);
+
+        return parent::removeCheck($checks);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCheckerName(\Alchemy\Phrasea\Model\Entities\LazaretCheck $checks)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCheckerName', [$checks]);
+
+        return parent::getCheckerName($checks);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getChecks()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getChecks', []);
+
+        return parent::getChecks();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getChecksWhithNameKey()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getChecksWhithNameKey', []);
+
+        return parent::getChecksWhithNameKey();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setSession(\Alchemy\Phrasea\Model\Entities\LazaretSession $session = NULL)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setSession', [$session]);
+
+        return parent::setSession($session);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getSession()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getSession', []);
+
+        return parent::getSession();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getRecordsToSubstitute(\Alchemy\Phrasea\Application $app, $includeReason = false)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getRecordsToSubstitute', [$app, $includeReason]);
+
+        return parent::getRecordsToSubstitute($app, $includeReason);
+    }
+
+}
--- a/resources/proxies/CGAlchemyPhraseaModelEntitiesLazaretSession.php
+++ b/resources/proxies/CGAlchemyPhraseaModelEntitiesLazaretSession.php
@@ -0,0 +1,290 @@
+<?php
+
+namespace Alchemy\Phrasea\Model\Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
+
+/**
+ * DO NOT EDIT THIS FILE - IT WAS CREATED BY DOCTRINE'S PROXY GENERATOR
+ */
+class LazaretSession extends \Alchemy\Phrasea\Model\Entities\LazaretSession implements \Doctrine\ORM\Proxy\Proxy
+{
+    /**
+     * @var \Closure the callback responsible for loading properties in the proxy object. This callback is called with
+     *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
+     *      initialization process and an array of ordered parameters that were passed to that method.
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     */
+    public $__initializer__;
+
+    /**
+     * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     */
+    public $__cloner__;
+
+    /**
+     * @var boolean flag indicating if this object was already initialized
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__isInitialized
+     */
+    public $__isInitialized__ = false;
+
+    /**
+     * @var array properties to be lazy loaded, with keys being the property
+     *            names and values being their default values
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     */
+    public static $lazyPropertiesDefaults = [];
+
+
+
+    /**
+     * @param \Closure $initializer
+     * @param \Closure $cloner
+     */
+    public function __construct($initializer = null, $cloner = null)
+    {
+
+        $this->__initializer__ = $initializer;
+        $this->__cloner__      = $cloner;
+    }
+
+
+
+
+
+
+
+    /**
+     * 
+     * @return array
+     */
+    public function __sleep()
+    {
+        if ($this->__isInitialized__) {
+            return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretSession' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretSession' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretSession' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretSession' . "\0" . 'updated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretSession' . "\0" . 'files'];
+        }
+
+        return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretSession' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretSession' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretSession' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretSession' . "\0" . 'updated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretSession' . "\0" . 'files'];
+    }
+
+    /**
+     * 
+     */
+    public function __wakeup()
+    {
+        if ( ! $this->__isInitialized__) {
+            $this->__initializer__ = function (LazaretSession $proxy) {
+                $proxy->__setInitializer(null);
+                $proxy->__setCloner(null);
+
+                $existingProperties = get_object_vars($proxy);
+
+                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                    if ( ! array_key_exists($property, $existingProperties)) {
+                        $proxy->$property = $defaultValue;
+                    }
+                }
+            };
+
+        }
+    }
+
+    /**
+     * 
+     */
+    public function __clone()
+    {
+        $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', []);
+    }
+
+    /**
+     * Forces initialization of the proxy
+     */
+    public function __load()
+    {
+        $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', []);
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __isInitialized()
+    {
+        return $this->__isInitialized__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitialized($initialized)
+    {
+        $this->__isInitialized__ = $initialized;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitializer(\Closure $initializer = null)
+    {
+        $this->__initializer__ = $initializer;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __getInitializer()
+    {
+        return $this->__initializer__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setCloner(\Closure $cloner = null)
+    {
+        $this->__cloner__ = $cloner;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific cloning logic
+     */
+    public function __getCloner()
+    {
+        return $this->__cloner__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @static
+     */
+    public function __getLazyProperties()
+    {
+        return self::$lazyPropertiesDefaults;
+    }
+
+    
+    /**
+     * {@inheritDoc}
+     */
+    public function getId()
+    {
+        if ($this->__isInitialized__ === false) {
+            return (int)  parent::getId();
+        }
+
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', []);
+
+        return parent::getId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setUser(\Alchemy\Phrasea\Model\Entities\User $user)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUser', [$user]);
+
+        return parent::setUser($user);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getUser()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUser', []);
+
+        return parent::getUser();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setCreated(\DateTime $created)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreated', [$created]);
+
+        return parent::setCreated($created);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCreated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreated', []);
+
+        return parent::getCreated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setUpdated(\DateTime $updated)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUpdated', [$updated]);
+
+        return parent::setUpdated($updated);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getUpdated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUpdated', []);
+
+        return parent::getUpdated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function addFile(\Alchemy\Phrasea\Model\Entities\LazaretFile $files)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'addFile', [$files]);
+
+        return parent::addFile($files);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function removeFile(\Alchemy\Phrasea\Model\Entities\LazaretFile $files)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'removeFile', [$files]);
+
+        return parent::removeFile($files);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getFiles()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getFiles', []);
+
+        return parent::getFiles();
+    }
+
+}
--- a/resources/proxies/CGAlchemyPhraseaModelEntitiesOrder.php
+++ b/resources/proxies/CGAlchemyPhraseaModelEntitiesOrder.php
@@ -0,0 +1,411 @@
+<?php
+
+namespace Alchemy\Phrasea\Model\Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
+
+/**
+ * DO NOT EDIT THIS FILE - IT WAS CREATED BY DOCTRINE'S PROXY GENERATOR
+ */
+class Order extends \Alchemy\Phrasea\Model\Entities\Order implements \Doctrine\ORM\Proxy\Proxy
+{
+    /**
+     * @var \Closure the callback responsible for loading properties in the proxy object. This callback is called with
+     *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
+     *      initialization process and an array of ordered parameters that were passed to that method.
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     */
+    public $__initializer__;
+
+    /**
+     * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     */
+    public $__cloner__;
+
+    /**
+     * @var boolean flag indicating if this object was already initialized
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__isInitialized
+     */
+    public $__isInitialized__ = false;
+
+    /**
+     * @var array properties to be lazy loaded, with keys being the property
+     *            names and values being their default values
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     */
+    public static $lazyPropertiesDefaults = [];
+
+
+
+    /**
+     * @param \Closure $initializer
+     * @param \Closure $cloner
+     */
+    public function __construct($initializer = null, $cloner = null)
+    {
+
+        $this->__initializer__ = $initializer;
+        $this->__cloner__      = $cloner;
+    }
+
+
+
+
+
+
+
+    /**
+     * 
+     * @return array
+     */
+    public function __sleep()
+    {
+        if ($this->__isInitialized__) {
+            return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'orderUsage', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'todo', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'deadline', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'createdOn', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'elements', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'basket', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'notificationMethod'];
+        }
+
+        return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'orderUsage', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'todo', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'deadline', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'createdOn', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'elements', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'basket', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'notificationMethod'];
+    }
+
+    /**
+     * 
+     */
+    public function __wakeup()
+    {
+        if ( ! $this->__isInitialized__) {
+            $this->__initializer__ = function (Order $proxy) {
+                $proxy->__setInitializer(null);
+                $proxy->__setCloner(null);
+
+                $existingProperties = get_object_vars($proxy);
+
+                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                    if ( ! array_key_exists($property, $existingProperties)) {
+                        $proxy->$property = $defaultValue;
+                    }
+                }
+            };
+
+        }
+    }
+
+    /**
+     * 
+     */
+    public function __clone()
+    {
+        $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', []);
+    }
+
+    /**
+     * Forces initialization of the proxy
+     */
+    public function __load()
+    {
+        $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', []);
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __isInitialized()
+    {
+        return $this->__isInitialized__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitialized($initialized)
+    {
+        $this->__isInitialized__ = $initialized;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitializer(\Closure $initializer = null)
+    {
+        $this->__initializer__ = $initializer;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __getInitializer()
+    {
+        return $this->__initializer__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setCloner(\Closure $cloner = null)
+    {
+        $this->__cloner__ = $cloner;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific cloning logic
+     */
+    public function __getCloner()
+    {
+        return $this->__cloner__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @static
+     */
+    public function __getLazyProperties()
+    {
+        return self::$lazyPropertiesDefaults;
+    }
+
+    
+    /**
+     * {@inheritDoc}
+     */
+    public function getId()
+    {
+        if ($this->__isInitialized__ === false) {
+            return (int)  parent::getId();
+        }
+
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', []);
+
+        return parent::getId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getUser()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUser', []);
+
+        return parent::getUser();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setUser(\Alchemy\Phrasea\Model\Entities\User $user)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUser', [$user]);
+
+        return parent::setUser($user);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getDeadline()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getDeadline', []);
+
+        return parent::getDeadline();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setDeadline($deadline)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setDeadline', [$deadline]);
+
+        return parent::setDeadline($deadline);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCreatedOn()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreatedOn', []);
+
+        return parent::getCreatedOn();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setCreatedOn($createdOn)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreatedOn', [$createdOn]);
+
+        return parent::setCreatedOn($createdOn);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function addElement(\Alchemy\Phrasea\Model\Entities\OrderElement $elements)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'addElement', [$elements]);
+
+        return parent::addElement($elements);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function removeElement(\Alchemy\Phrasea\Model\Entities\OrderElement $elements)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'removeElement', [$elements]);
+
+        return parent::removeElement($elements);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getElements()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getElements', []);
+
+        return parent::getElements();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getTodo()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getTodo', []);
+
+        return parent::getTodo();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setTodo($todo)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setTodo', [$todo]);
+
+        return parent::setTodo($todo);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function decrementTodo($count)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'decrementTodo', [$count]);
+
+        return parent::decrementTodo($count);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getTotal()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getTotal', []);
+
+        return parent::getTotal();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getTotalTreatedItems()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getTotalTreatedItems', []);
+
+        return parent::getTotalTreatedItems();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getOrderUsage()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getOrderUsage', []);
+
+        return parent::getOrderUsage();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setOrderUsage($orderUsage)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setOrderUsage', [$orderUsage]);
+
+        return parent::setOrderUsage($orderUsage);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getBasket()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getBasket', []);
+
+        return parent::getBasket();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setBasket(\Alchemy\Phrasea\Model\Entities\Basket $basket = NULL)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setBasket', [$basket]);
+
+        return parent::setBasket($basket);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getNotificationMethod()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getNotificationMethod', []);
+
+        return parent::getNotificationMethod();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setNotificationMethod($methodName)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setNotificationMethod', [$methodName]);
+
+        return parent::setNotificationMethod($methodName);
+    }
+
+}
--- a/resources/proxies/CGAlchemyPhraseaModelEntitiesOrderElement.php
+++ b/resources/proxies/CGAlchemyPhraseaModelEntitiesOrderElement.php
@@ -0,0 +1,323 @@
+<?php
+
+namespace Alchemy\Phrasea\Model\Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
+
+/**
+ * DO NOT EDIT THIS FILE - IT WAS CREATED BY DOCTRINE'S PROXY GENERATOR
+ */
+class OrderElement extends \Alchemy\Phrasea\Model\Entities\OrderElement implements \Doctrine\ORM\Proxy\Proxy
+{
+    /**
+     * @var \Closure the callback responsible for loading properties in the proxy object. This callback is called with
+     *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
+     *      initialization process and an array of ordered parameters that were passed to that method.
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     */
+    public $__initializer__;
+
+    /**
+     * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     */
+    public $__cloner__;
+
+    /**
+     * @var boolean flag indicating if this object was already initialized
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__isInitialized
+     */
+    public $__isInitialized__ = false;
+
+    /**
+     * @var array properties to be lazy loaded, with keys being the property
+     *            names and values being their default values
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     */
+    public static $lazyPropertiesDefaults = [];
+
+
+
+    /**
+     * @param \Closure $initializer
+     * @param \Closure $cloner
+     */
+    public function __construct($initializer = null, $cloner = null)
+    {
+
+        $this->__initializer__ = $initializer;
+        $this->__cloner__      = $cloner;
+    }
+
+
+
+
+
+
+
+    /**
+     * 
+     * @return array
+     */
+    public function __sleep()
+    {
+        if ($this->__isInitialized__) {
+            return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\OrderElement' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\OrderElement' . "\0" . 'baseId', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\OrderElement' . "\0" . 'recordId', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\OrderElement' . "\0" . 'orderMaster', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\OrderElement' . "\0" . 'deny', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\OrderElement' . "\0" . 'order'];
+        }
+
+        return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\OrderElement' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\OrderElement' . "\0" . 'baseId', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\OrderElement' . "\0" . 'recordId', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\OrderElement' . "\0" . 'orderMaster', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\OrderElement' . "\0" . 'deny', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\OrderElement' . "\0" . 'order'];
+    }
+
+    /**
+     * 
+     */
+    public function __wakeup()
+    {
+        if ( ! $this->__isInitialized__) {
+            $this->__initializer__ = function (OrderElement $proxy) {
+                $proxy->__setInitializer(null);
+                $proxy->__setCloner(null);
+
+                $existingProperties = get_object_vars($proxy);
+
+                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                    if ( ! array_key_exists($property, $existingProperties)) {
+                        $proxy->$property = $defaultValue;
+                    }
+                }
+            };
+
+        }
+    }
+
+    /**
+     * 
+     */
+    public function __clone()
+    {
+        $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', []);
+    }
+
+    /**
+     * Forces initialization of the proxy
+     */
+    public function __load()
+    {
+        $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', []);
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __isInitialized()
+    {
+        return $this->__isInitialized__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitialized($initialized)
+    {
+        $this->__isInitialized__ = $initialized;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitializer(\Closure $initializer = null)
+    {
+        $this->__initializer__ = $initializer;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __getInitializer()
+    {
+        return $this->__initializer__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setCloner(\Closure $cloner = null)
+    {
+        $this->__cloner__ = $cloner;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific cloning logic
+     */
+    public function __getCloner()
+    {
+        return $this->__cloner__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @static
+     */
+    public function __getLazyProperties()
+    {
+        return self::$lazyPropertiesDefaults;
+    }
+
+    
+    /**
+     * {@inheritDoc}
+     */
+    public function getId()
+    {
+        if ($this->__isInitialized__ === false) {
+            return (int)  parent::getId();
+        }
+
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', []);
+
+        return parent::getId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setOrderMaster(\Alchemy\Phrasea\Model\Entities\User $user = NULL)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setOrderMaster', [$user]);
+
+        return parent::setOrderMaster($user);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getOrderMaster()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getOrderMaster', []);
+
+        return parent::getOrderMaster();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setDeny($deny)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setDeny', [$deny]);
+
+        return parent::setDeny($deny);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getDeny()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getDeny', []);
+
+        return parent::getDeny();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setOrder(\Alchemy\Phrasea\Model\Entities\Order $order = NULL)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setOrder', [$order]);
+
+        return parent::setOrder($order);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getOrder()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getOrder', []);
+
+        return parent::getOrder();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setBaseId($baseId)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setBaseId', [$baseId]);
+
+        return parent::setBaseId($baseId);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getBaseId()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getBaseId', []);
+
+        return parent::getBaseId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setRecordId($recordId)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setRecordId', [$recordId]);
+
+        return parent::setRecordId($recordId);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getRecordId()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getRecordId', []);
+
+        return parent::getRecordId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getRecord(\Alchemy\Phrasea\Application $app)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getRecord', [$app]);
+
+        return parent::getRecord($app);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getSbasId(\Alchemy\Phrasea\Application $app)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getSbasId', [$app]);
+
+        return parent::getSbasId($app);
+    }
+
+}
--- a/resources/proxies/CGAlchemyPhraseaModelEntitiesPreset.php
+++ b/resources/proxies/CGAlchemyPhraseaModelEntitiesPreset.php
@@ -0,0 +1,301 @@
+<?php
+
+namespace Alchemy\Phrasea\Model\Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
+
+/**
+ * DO NOT EDIT THIS FILE - IT WAS CREATED BY DOCTRINE'S PROXY GENERATOR
+ */
+class Preset extends \Alchemy\Phrasea\Model\Entities\Preset implements \Doctrine\ORM\Proxy\Proxy
+{
+    /**
+     * @var \Closure the callback responsible for loading properties in the proxy object. This callback is called with
+     *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
+     *      initialization process and an array of ordered parameters that were passed to that method.
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     */
+    public $__initializer__;
+
+    /**
+     * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     */
+    public $__cloner__;
+
+    /**
+     * @var boolean flag indicating if this object was already initialized
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__isInitialized
+     */
+    public $__isInitialized__ = false;
+
+    /**
+     * @var array properties to be lazy loaded, with keys being the property
+     *            names and values being their default values
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     */
+    public static $lazyPropertiesDefaults = [];
+
+
+
+    /**
+     * @param \Closure $initializer
+     * @param \Closure $cloner
+     */
+    public function __construct($initializer = null, $cloner = null)
+    {
+
+        $this->__initializer__ = $initializer;
+        $this->__cloner__      = $cloner;
+    }
+
+
+
+
+
+
+
+    /**
+     * 
+     * @return array
+     */
+    public function __sleep()
+    {
+        if ($this->__isInitialized__) {
+            return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Preset' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Preset' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Preset' . "\0" . 'sbasId', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Preset' . "\0" . 'title', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Preset' . "\0" . 'data', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Preset' . "\0" . 'created'];
+        }
+
+        return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Preset' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Preset' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Preset' . "\0" . 'sbasId', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Preset' . "\0" . 'title', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Preset' . "\0" . 'data', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Preset' . "\0" . 'created'];
+    }
+
+    /**
+     * 
+     */
+    public function __wakeup()
+    {
+        if ( ! $this->__isInitialized__) {
+            $this->__initializer__ = function (Preset $proxy) {
+                $proxy->__setInitializer(null);
+                $proxy->__setCloner(null);
+
+                $existingProperties = get_object_vars($proxy);
+
+                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                    if ( ! array_key_exists($property, $existingProperties)) {
+                        $proxy->$property = $defaultValue;
+                    }
+                }
+            };
+
+        }
+    }
+
+    /**
+     * 
+     */
+    public function __clone()
+    {
+        $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', []);
+    }
+
+    /**
+     * Forces initialization of the proxy
+     */
+    public function __load()
+    {
+        $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', []);
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __isInitialized()
+    {
+        return $this->__isInitialized__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitialized($initialized)
+    {
+        $this->__isInitialized__ = $initialized;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitializer(\Closure $initializer = null)
+    {
+        $this->__initializer__ = $initializer;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __getInitializer()
+    {
+        return $this->__initializer__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setCloner(\Closure $cloner = null)
+    {
+        $this->__cloner__ = $cloner;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific cloning logic
+     */
+    public function __getCloner()
+    {
+        return $this->__cloner__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @static
+     */
+    public function __getLazyProperties()
+    {
+        return self::$lazyPropertiesDefaults;
+    }
+
+    
+    /**
+     * {@inheritDoc}
+     */
+    public function getId()
+    {
+        if ($this->__isInitialized__ === false) {
+            return (int)  parent::getId();
+        }
+
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', []);
+
+        return parent::getId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getUser()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUser', []);
+
+        return parent::getUser();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setUser(\Alchemy\Phrasea\Model\Entities\User $user)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUser', [$user]);
+
+        return parent::setUser($user);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getSbasId()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getSbasId', []);
+
+        return parent::getSbasId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setSbasId($sbasId)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setSbasId', [$sbasId]);
+
+        return parent::setSbasId($sbasId);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getTitle()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getTitle', []);
+
+        return parent::getTitle();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setTitle($title)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setTitle', [$title]);
+
+        return parent::setTitle($title);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setData(array $data)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setData', [$data]);
+
+        return parent::setData($data);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getData()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getData', []);
+
+        return parent::getData();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCreated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreated', []);
+
+        return parent::getCreated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setCreated(\DateTime $created)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreated', [$created]);
+
+        return parent::setCreated($created);
+    }
+
+}
--- a/resources/proxies/CGAlchemyPhraseaModelEntitiesRegistration.php
+++ b/resources/proxies/CGAlchemyPhraseaModelEntitiesRegistration.php
@@ -0,0 +1,345 @@
+<?php
+
+namespace Alchemy\Phrasea\Model\Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
+
+/**
+ * DO NOT EDIT THIS FILE - IT WAS CREATED BY DOCTRINE'S PROXY GENERATOR
+ */
+class Registration extends \Alchemy\Phrasea\Model\Entities\Registration implements \Doctrine\ORM\Proxy\Proxy
+{
+    /**
+     * @var \Closure the callback responsible for loading properties in the proxy object. This callback is called with
+     *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
+     *      initialization process and an array of ordered parameters that were passed to that method.
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     */
+    public $__initializer__;
+
+    /**
+     * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     */
+    public $__cloner__;
+
+    /**
+     * @var boolean flag indicating if this object was already initialized
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__isInitialized
+     */
+    public $__isInitialized__ = false;
+
+    /**
+     * @var array properties to be lazy loaded, with keys being the property
+     *            names and values being their default values
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     */
+    public static $lazyPropertiesDefaults = [];
+
+
+
+    /**
+     * @param \Closure $initializer
+     * @param \Closure $cloner
+     */
+    public function __construct($initializer = null, $cloner = null)
+    {
+
+        $this->__initializer__ = $initializer;
+        $this->__cloner__      = $cloner;
+    }
+
+
+
+
+
+
+
+    /**
+     * 
+     * @return array
+     */
+    public function __sleep()
+    {
+        if ($this->__isInitialized__) {
+            return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Registration' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Registration' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Registration' . "\0" . 'baseId', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Registration' . "\0" . 'pending', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Registration' . "\0" . 'rejected', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Registration' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Registration' . "\0" . 'updated'];
+        }
+
+        return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Registration' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Registration' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Registration' . "\0" . 'baseId', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Registration' . "\0" . 'pending', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Registration' . "\0" . 'rejected', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Registration' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Registration' . "\0" . 'updated'];
+    }
+
+    /**
+     * 
+     */
+    public function __wakeup()
+    {
+        if ( ! $this->__isInitialized__) {
+            $this->__initializer__ = function (Registration $proxy) {
+                $proxy->__setInitializer(null);
+                $proxy->__setCloner(null);
+
+                $existingProperties = get_object_vars($proxy);
+
+                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                    if ( ! array_key_exists($property, $existingProperties)) {
+                        $proxy->$property = $defaultValue;
+                    }
+                }
+            };
+
+        }
+    }
+
+    /**
+     * 
+     */
+    public function __clone()
+    {
+        $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', []);
+    }
+
+    /**
+     * Forces initialization of the proxy
+     */
+    public function __load()
+    {
+        $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', []);
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __isInitialized()
+    {
+        return $this->__isInitialized__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitialized($initialized)
+    {
+        $this->__isInitialized__ = $initialized;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitializer(\Closure $initializer = null)
+    {
+        $this->__initializer__ = $initializer;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __getInitializer()
+    {
+        return $this->__initializer__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setCloner(\Closure $cloner = null)
+    {
+        $this->__cloner__ = $cloner;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific cloning logic
+     */
+    public function __getCloner()
+    {
+        return $this->__cloner__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @static
+     */
+    public function __getLazyProperties()
+    {
+        return self::$lazyPropertiesDefaults;
+    }
+
+    
+    /**
+     * {@inheritDoc}
+     */
+    public function getId()
+    {
+        if ($this->__isInitialized__ === false) {
+            return (int)  parent::getId();
+        }
+
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', []);
+
+        return parent::getId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setPending($pending)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setPending', [$pending]);
+
+        return parent::setPending($pending);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function isPending()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'isPending', []);
+
+        return parent::isPending();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setRejected($rejected)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setRejected', [$rejected]);
+
+        return parent::setRejected($rejected);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function isRejected()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'isRejected', []);
+
+        return parent::isRejected();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setUser(\Alchemy\Phrasea\Model\Entities\User $user)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUser', [$user]);
+
+        return parent::setUser($user);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getUser()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUser', []);
+
+        return parent::getUser();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCollection(\Alchemy\Phrasea\Application $app)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCollection', [$app]);
+
+        return parent::getCollection($app);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setCollection(\collection $collection)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCollection', [$collection]);
+
+        return parent::setCollection($collection);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setBaseId($baseId)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setBaseId', [$baseId]);
+
+        return parent::setBaseId($baseId);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getBaseId()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getBaseId', []);
+
+        return parent::getBaseId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCreated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreated', []);
+
+        return parent::getCreated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getUpdated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUpdated', []);
+
+        return parent::getUpdated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setCreated(\DateTime $created)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreated', [$created]);
+
+        return parent::setCreated($created);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setUpdated(\DateTime $updated)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUpdated', [$updated]);
+
+        return parent::setUpdated($updated);
+    }
+
+}
--- a/resources/proxies/CGAlchemyPhraseaModelEntitiesSecret.php
+++ b/resources/proxies/CGAlchemyPhraseaModelEntitiesSecret.php
@@ -0,0 +1,224 @@
+<?php
+
+namespace Alchemy\Phrasea\Model\Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
+
+/**
+ * DO NOT EDIT THIS FILE - IT WAS CREATED BY DOCTRINE'S PROXY GENERATOR
+ */
+class Secret extends \Alchemy\Phrasea\Model\Entities\Secret implements \Doctrine\ORM\Proxy\Proxy
+{
+    /**
+     * @var \Closure the callback responsible for loading properties in the proxy object. This callback is called with
+     *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
+     *      initialization process and an array of ordered parameters that were passed to that method.
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     */
+    public $__initializer__;
+
+    /**
+     * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     */
+    public $__cloner__;
+
+    /**
+     * @var boolean flag indicating if this object was already initialized
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__isInitialized
+     */
+    public $__isInitialized__ = false;
+
+    /**
+     * @var array properties to be lazy loaded, with keys being the property
+     *            names and values being their default values
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     */
+    public static $lazyPropertiesDefaults = [];
+
+
+
+    /**
+     * @param \Closure $initializer
+     * @param \Closure $cloner
+     */
+    public function __construct($initializer = null, $cloner = null)
+    {
+
+        $this->__initializer__ = $initializer;
+        $this->__cloner__      = $cloner;
+    }
+
+
+
+
+
+
+
+    /**
+     * 
+     * @return array
+     */
+    public function __sleep()
+    {
+        if ($this->__isInitialized__) {
+            return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Secret' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Secret' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Secret' . "\0" . 'token', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Secret' . "\0" . 'creator'];
+        }
+
+        return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Secret' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Secret' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Secret' . "\0" . 'token', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Secret' . "\0" . 'creator'];
+    }
+
+    /**
+     * 
+     */
+    public function __wakeup()
+    {
+        if ( ! $this->__isInitialized__) {
+            $this->__initializer__ = function (Secret $proxy) {
+                $proxy->__setInitializer(null);
+                $proxy->__setCloner(null);
+
+                $existingProperties = get_object_vars($proxy);
+
+                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                    if ( ! array_key_exists($property, $existingProperties)) {
+                        $proxy->$property = $defaultValue;
+                    }
+                }
+            };
+
+        }
+    }
+
+    /**
+     * 
+     */
+    public function __clone()
+    {
+        $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', []);
+    }
+
+    /**
+     * Forces initialization of the proxy
+     */
+    public function __load()
+    {
+        $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', []);
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __isInitialized()
+    {
+        return $this->__isInitialized__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitialized($initialized)
+    {
+        $this->__isInitialized__ = $initialized;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitializer(\Closure $initializer = null)
+    {
+        $this->__initializer__ = $initializer;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __getInitializer()
+    {
+        return $this->__initializer__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setCloner(\Closure $cloner = null)
+    {
+        $this->__cloner__ = $cloner;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific cloning logic
+     */
+    public function __getCloner()
+    {
+        return $this->__cloner__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @static
+     */
+    public function __getLazyProperties()
+    {
+        return self::$lazyPropertiesDefaults;
+    }
+
+    
+    /**
+     * {@inheritDoc}
+     */
+    public function getId()
+    {
+        if ($this->__isInitialized__ === false) {
+            return (int)  parent::getId();
+        }
+
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', []);
+
+        return parent::getId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCreated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreated', []);
+
+        return parent::getCreated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCreator()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreator', []);
+
+        return parent::getCreator();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getToken()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getToken', []);
+
+        return parent::getToken();
+    }
+
+}
--- a/resources/proxies/CGAlchemyPhraseaModelEntitiesSession.php
+++ b/resources/proxies/CGAlchemyPhraseaModelEntitiesSession.php
@@ -0,0 +1,510 @@
+<?php
+
+namespace Alchemy\Phrasea\Model\Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
+
+/**
+ * DO NOT EDIT THIS FILE - IT WAS CREATED BY DOCTRINE'S PROXY GENERATOR
+ */
+class Session extends \Alchemy\Phrasea\Model\Entities\Session implements \Doctrine\ORM\Proxy\Proxy
+{
+    /**
+     * @var \Closure the callback responsible for loading properties in the proxy object. This callback is called with
+     *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
+     *      initialization process and an array of ordered parameters that were passed to that method.
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     */
+    public $__initializer__;
+
+    /**
+     * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     */
+    public $__cloner__;
+
+    /**
+     * @var boolean flag indicating if this object was already initialized
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__isInitialized
+     */
+    public $__isInitialized__ = false;
+
+    /**
+     * @var array properties to be lazy loaded, with keys being the property
+     *            names and values being their default values
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     */
+    public static $lazyPropertiesDefaults = [];
+
+
+
+    /**
+     * @param \Closure $initializer
+     * @param \Closure $cloner
+     */
+    public function __construct($initializer = null, $cloner = null)
+    {
+
+        $this->__initializer__ = $initializer;
+        $this->__cloner__      = $cloner;
+    }
+
+
+
+
+
+
+
+    /**
+     * 
+     * @return array
+     */
+    public function __sleep()
+    {
+        if ($this->__isInitialized__) {
+            return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Session' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Session' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Session' . "\0" . 'user_agent', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Session' . "\0" . 'ip_address', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Session' . "\0" . 'platform', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Session' . "\0" . 'browser_name', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Session' . "\0" . 'browser_version', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Session' . "\0" . 'screen_width', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Session' . "\0" . 'screen_height', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Session' . "\0" . 'token', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Session' . "\0" . 'nonce', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Session' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Session' . "\0" . 'updated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Session' . "\0" . 'modules'];
+        }
+
+        return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Session' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Session' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Session' . "\0" . 'user_agent', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Session' . "\0" . 'ip_address', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Session' . "\0" . 'platform', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Session' . "\0" . 'browser_name', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Session' . "\0" . 'browser_version', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Session' . "\0" . 'screen_width', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Session' . "\0" . 'screen_height', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Session' . "\0" . 'token', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Session' . "\0" . 'nonce', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Session' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Session' . "\0" . 'updated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Session' . "\0" . 'modules'];
+    }
+
+    /**
+     * 
+     */
+    public function __wakeup()
+    {
+        if ( ! $this->__isInitialized__) {
+            $this->__initializer__ = function (Session $proxy) {
+                $proxy->__setInitializer(null);
+                $proxy->__setCloner(null);
+
+                $existingProperties = get_object_vars($proxy);
+
+                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                    if ( ! array_key_exists($property, $existingProperties)) {
+                        $proxy->$property = $defaultValue;
+                    }
+                }
+            };
+
+        }
+    }
+
+    /**
+     * 
+     */
+    public function __clone()
+    {
+        $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', []);
+    }
+
+    /**
+     * Forces initialization of the proxy
+     */
+    public function __load()
+    {
+        $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', []);
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __isInitialized()
+    {
+        return $this->__isInitialized__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitialized($initialized)
+    {
+        $this->__isInitialized__ = $initialized;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitializer(\Closure $initializer = null)
+    {
+        $this->__initializer__ = $initializer;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __getInitializer()
+    {
+        return $this->__initializer__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setCloner(\Closure $cloner = null)
+    {
+        $this->__cloner__ = $cloner;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific cloning logic
+     */
+    public function __getCloner()
+    {
+        return $this->__cloner__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @static
+     */
+    public function __getLazyProperties()
+    {
+        return self::$lazyPropertiesDefaults;
+    }
+
+    
+    /**
+     * {@inheritDoc}
+     */
+    public function getId()
+    {
+        if ($this->__isInitialized__ === false) {
+            return (int)  parent::getId();
+        }
+
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', []);
+
+        return parent::getId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setUser(\Alchemy\Phrasea\Model\Entities\User $user)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUser', [$user]);
+
+        return parent::setUser($user);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getUser()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUser', []);
+
+        return parent::getUser();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setUserAgent($userAgent)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUserAgent', [$userAgent]);
+
+        return parent::setUserAgent($userAgent);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getUserAgent()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUserAgent', []);
+
+        return parent::getUserAgent();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setIpAddress($ipAddress)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setIpAddress', [$ipAddress]);
+
+        return parent::setIpAddress($ipAddress);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getIpAddress()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getIpAddress', []);
+
+        return parent::getIpAddress();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setPlatform($platform)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setPlatform', [$platform]);
+
+        return parent::setPlatform($platform);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getPlatform()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getPlatform', []);
+
+        return parent::getPlatform();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setBrowserName($browserName)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setBrowserName', [$browserName]);
+
+        return parent::setBrowserName($browserName);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getBrowserName()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getBrowserName', []);
+
+        return parent::getBrowserName();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setBrowserVersion($browserVersion)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setBrowserVersion', [$browserVersion]);
+
+        return parent::setBrowserVersion($browserVersion);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getBrowserVersion()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getBrowserVersion', []);
+
+        return parent::getBrowserVersion();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setScreenWidth($screenWidth)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setScreenWidth', [$screenWidth]);
+
+        return parent::setScreenWidth($screenWidth);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getScreenWidth()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getScreenWidth', []);
+
+        return parent::getScreenWidth();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setScreenHeight($screenHeight)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setScreenHeight', [$screenHeight]);
+
+        return parent::setScreenHeight($screenHeight);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getScreenHeight()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getScreenHeight', []);
+
+        return parent::getScreenHeight();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setToken($token)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setToken', [$token]);
+
+        return parent::setToken($token);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getToken()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getToken', []);
+
+        return parent::getToken();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setNonce($nonce)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setNonce', [$nonce]);
+
+        return parent::setNonce($nonce);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getNonce()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getNonce', []);
+
+        return parent::getNonce();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setCreated(\DateTime $created)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreated', [$created]);
+
+        return parent::setCreated($created);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCreated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreated', []);
+
+        return parent::getCreated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setUpdated(\DateTime $updated)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUpdated', [$updated]);
+
+        return parent::setUpdated($updated);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getUpdated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUpdated', []);
+
+        return parent::getUpdated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function addModule(\Alchemy\Phrasea\Model\Entities\SessionModule $modules)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'addModule', [$modules]);
+
+        return parent::addModule($modules);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function removeModule(\Alchemy\Phrasea\Model\Entities\SessionModule $modules)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'removeModule', [$modules]);
+
+        return parent::removeModule($modules);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getModules()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getModules', []);
+
+        return parent::getModules();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getModuleById($moduleId)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getModuleById', [$moduleId]);
+
+        return parent::getModuleById($moduleId);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function hasModuleId($moduleId)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'hasModuleId', [$moduleId]);
+
+        return parent::hasModuleId($moduleId);
+    }
+
+}
--- a/resources/proxies/CGAlchemyPhraseaModelEntitiesSessionModule.php
+++ b/resources/proxies/CGAlchemyPhraseaModelEntitiesSessionModule.php
@@ -0,0 +1,279 @@
+<?php
+
+namespace Alchemy\Phrasea\Model\Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
+
+/**
+ * DO NOT EDIT THIS FILE - IT WAS CREATED BY DOCTRINE'S PROXY GENERATOR
+ */
+class SessionModule extends \Alchemy\Phrasea\Model\Entities\SessionModule implements \Doctrine\ORM\Proxy\Proxy
+{
+    /**
+     * @var \Closure the callback responsible for loading properties in the proxy object. This callback is called with
+     *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
+     *      initialization process and an array of ordered parameters that were passed to that method.
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     */
+    public $__initializer__;
+
+    /**
+     * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     */
+    public $__cloner__;
+
+    /**
+     * @var boolean flag indicating if this object was already initialized
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__isInitialized
+     */
+    public $__isInitialized__ = false;
+
+    /**
+     * @var array properties to be lazy loaded, with keys being the property
+     *            names and values being their default values
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     */
+    public static $lazyPropertiesDefaults = [];
+
+
+
+    /**
+     * @param \Closure $initializer
+     * @param \Closure $cloner
+     */
+    public function __construct($initializer = null, $cloner = null)
+    {
+
+        $this->__initializer__ = $initializer;
+        $this->__cloner__      = $cloner;
+    }
+
+
+
+
+
+
+
+    /**
+     * 
+     * @return array
+     */
+    public function __sleep()
+    {
+        if ($this->__isInitialized__) {
+            return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\SessionModule' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\SessionModule' . "\0" . 'module_id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\SessionModule' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\SessionModule' . "\0" . 'updated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\SessionModule' . "\0" . 'session'];
+        }
+
+        return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\SessionModule' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\SessionModule' . "\0" . 'module_id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\SessionModule' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\SessionModule' . "\0" . 'updated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\SessionModule' . "\0" . 'session'];
+    }
+
+    /**
+     * 
+     */
+    public function __wakeup()
+    {
+        if ( ! $this->__isInitialized__) {
+            $this->__initializer__ = function (SessionModule $proxy) {
+                $proxy->__setInitializer(null);
+                $proxy->__setCloner(null);
+
+                $existingProperties = get_object_vars($proxy);
+
+                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                    if ( ! array_key_exists($property, $existingProperties)) {
+                        $proxy->$property = $defaultValue;
+                    }
+                }
+            };
+
+        }
+    }
+
+    /**
+     * 
+     */
+    public function __clone()
+    {
+        $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', []);
+    }
+
+    /**
+     * Forces initialization of the proxy
+     */
+    public function __load()
+    {
+        $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', []);
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __isInitialized()
+    {
+        return $this->__isInitialized__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitialized($initialized)
+    {
+        $this->__isInitialized__ = $initialized;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitializer(\Closure $initializer = null)
+    {
+        $this->__initializer__ = $initializer;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __getInitializer()
+    {
+        return $this->__initializer__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setCloner(\Closure $cloner = null)
+    {
+        $this->__cloner__ = $cloner;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific cloning logic
+     */
+    public function __getCloner()
+    {
+        return $this->__cloner__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @static
+     */
+    public function __getLazyProperties()
+    {
+        return self::$lazyPropertiesDefaults;
+    }
+
+    
+    /**
+     * {@inheritDoc}
+     */
+    public function getId()
+    {
+        if ($this->__isInitialized__ === false) {
+            return (int)  parent::getId();
+        }
+
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', []);
+
+        return parent::getId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setModuleId($moduleId)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setModuleId', [$moduleId]);
+
+        return parent::setModuleId($moduleId);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getModuleId()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getModuleId', []);
+
+        return parent::getModuleId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setCreated($created)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreated', [$created]);
+
+        return parent::setCreated($created);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCreated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreated', []);
+
+        return parent::getCreated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setUpdated(\DateTime $updated)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUpdated', [$updated]);
+
+        return parent::setUpdated($updated);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getUpdated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUpdated', []);
+
+        return parent::getUpdated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setSession(\Alchemy\Phrasea\Model\Entities\Session $session = NULL)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setSession', [$session]);
+
+        return parent::setSession($session);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getSession()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getSession', []);
+
+        return parent::getSession();
+    }
+
+}
--- a/resources/proxies/CGAlchemyPhraseaModelEntitiesStoryWZ.php
+++ b/resources/proxies/CGAlchemyPhraseaModelEntitiesStoryWZ.php
@@ -0,0 +1,301 @@
+<?php
+
+namespace Alchemy\Phrasea\Model\Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
+
+/**
+ * DO NOT EDIT THIS FILE - IT WAS CREATED BY DOCTRINE'S PROXY GENERATOR
+ */
+class StoryWZ extends \Alchemy\Phrasea\Model\Entities\StoryWZ implements \Doctrine\ORM\Proxy\Proxy
+{
+    /**
+     * @var \Closure the callback responsible for loading properties in the proxy object. This callback is called with
+     *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
+     *      initialization process and an array of ordered parameters that were passed to that method.
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     */
+    public $__initializer__;
+
+    /**
+     * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     */
+    public $__cloner__;
+
+    /**
+     * @var boolean flag indicating if this object was already initialized
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__isInitialized
+     */
+    public $__isInitialized__ = false;
+
+    /**
+     * @var array properties to be lazy loaded, with keys being the property
+     *            names and values being their default values
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     */
+    public static $lazyPropertiesDefaults = [];
+
+
+
+    /**
+     * @param \Closure $initializer
+     * @param \Closure $cloner
+     */
+    public function __construct($initializer = null, $cloner = null)
+    {
+
+        $this->__initializer__ = $initializer;
+        $this->__cloner__      = $cloner;
+    }
+
+
+
+
+
+
+
+    /**
+     * 
+     * @return array
+     */
+    public function __sleep()
+    {
+        if ($this->__isInitialized__) {
+            return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\StoryWZ' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\StoryWZ' . "\0" . 'sbas_id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\StoryWZ' . "\0" . 'record_id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\StoryWZ' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\StoryWZ' . "\0" . 'created'];
+        }
+
+        return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\StoryWZ' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\StoryWZ' . "\0" . 'sbas_id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\StoryWZ' . "\0" . 'record_id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\StoryWZ' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\StoryWZ' . "\0" . 'created'];
+    }
+
+    /**
+     * 
+     */
+    public function __wakeup()
+    {
+        if ( ! $this->__isInitialized__) {
+            $this->__initializer__ = function (StoryWZ $proxy) {
+                $proxy->__setInitializer(null);
+                $proxy->__setCloner(null);
+
+                $existingProperties = get_object_vars($proxy);
+
+                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                    if ( ! array_key_exists($property, $existingProperties)) {
+                        $proxy->$property = $defaultValue;
+                    }
+                }
+            };
+
+        }
+    }
+
+    /**
+     * 
+     */
+    public function __clone()
+    {
+        $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', []);
+    }
+
+    /**
+     * Forces initialization of the proxy
+     */
+    public function __load()
+    {
+        $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', []);
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __isInitialized()
+    {
+        return $this->__isInitialized__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitialized($initialized)
+    {
+        $this->__isInitialized__ = $initialized;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitializer(\Closure $initializer = null)
+    {
+        $this->__initializer__ = $initializer;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __getInitializer()
+    {
+        return $this->__initializer__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setCloner(\Closure $cloner = null)
+    {
+        $this->__cloner__ = $cloner;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific cloning logic
+     */
+    public function __getCloner()
+    {
+        return $this->__cloner__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @static
+     */
+    public function __getLazyProperties()
+    {
+        return self::$lazyPropertiesDefaults;
+    }
+
+    
+    /**
+     * {@inheritDoc}
+     */
+    public function getId()
+    {
+        if ($this->__isInitialized__ === false) {
+            return (int)  parent::getId();
+        }
+
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', []);
+
+        return parent::getId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setSbasId($sbasId)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setSbasId', [$sbasId]);
+
+        return parent::setSbasId($sbasId);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getSbasId()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getSbasId', []);
+
+        return parent::getSbasId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setRecordId($recordId)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setRecordId', [$recordId]);
+
+        return parent::setRecordId($recordId);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getRecordId()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getRecordId', []);
+
+        return parent::getRecordId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getRecord(\Alchemy\Phrasea\Application $app)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getRecord', [$app]);
+
+        return parent::getRecord($app);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setRecord(\record_adapter $record)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setRecord', [$record]);
+
+        return parent::setRecord($record);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setUser(\Alchemy\Phrasea\Model\Entities\User $user)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUser', [$user]);
+
+        return parent::setUser($user);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getUser()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUser', []);
+
+        return parent::getUser();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setCreated(\DateTime $created)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreated', [$created]);
+
+        return parent::setCreated($created);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCreated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreated', []);
+
+        return parent::getCreated();
+    }
+
+}
--- a/resources/proxies/CGAlchemyPhraseaModelEntitiesTask.php
+++ b/resources/proxies/CGAlchemyPhraseaModelEntitiesTask.php
@@ -0,0 +1,433 @@
+<?php
+
+namespace Alchemy\Phrasea\Model\Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
+
+/**
+ * DO NOT EDIT THIS FILE - IT WAS CREATED BY DOCTRINE'S PROXY GENERATOR
+ */
+class Task extends \Alchemy\Phrasea\Model\Entities\Task implements \Doctrine\ORM\Proxy\Proxy
+{
+    /**
+     * @var \Closure the callback responsible for loading properties in the proxy object. This callback is called with
+     *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
+     *      initialization process and an array of ordered parameters that were passed to that method.
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     */
+    public $__initializer__;
+
+    /**
+     * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     */
+    public $__cloner__;
+
+    /**
+     * @var boolean flag indicating if this object was already initialized
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__isInitialized
+     */
+    public $__isInitialized__ = false;
+
+    /**
+     * @var array properties to be lazy loaded, with keys being the property
+     *            names and values being their default values
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     */
+    public static $lazyPropertiesDefaults = [];
+
+
+
+    /**
+     * @param \Closure $initializer
+     * @param \Closure $cloner
+     */
+    public function __construct($initializer = null, $cloner = null)
+    {
+
+        $this->__initializer__ = $initializer;
+        $this->__cloner__      = $cloner;
+    }
+
+
+
+
+
+
+
+    /**
+     * 
+     * @return array
+     */
+    public function __sleep()
+    {
+        if ($this->__isInitialized__) {
+            return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Task' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Task' . "\0" . 'name', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Task' . "\0" . 'jobId', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Task' . "\0" . 'settings', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Task' . "\0" . 'completed', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Task' . "\0" . 'status', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Task' . "\0" . 'crashed', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Task' . "\0" . 'singleRun', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Task' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Task' . "\0" . 'updated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Task' . "\0" . 'lastExecution', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Task' . "\0" . 'period'];
+        }
+
+        return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Task' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Task' . "\0" . 'name', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Task' . "\0" . 'jobId', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Task' . "\0" . 'settings', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Task' . "\0" . 'completed', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Task' . "\0" . 'status', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Task' . "\0" . 'crashed', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Task' . "\0" . 'singleRun', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Task' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Task' . "\0" . 'updated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Task' . "\0" . 'lastExecution', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Task' . "\0" . 'period'];
+    }
+
+    /**
+     * 
+     */
+    public function __wakeup()
+    {
+        if ( ! $this->__isInitialized__) {
+            $this->__initializer__ = function (Task $proxy) {
+                $proxy->__setInitializer(null);
+                $proxy->__setCloner(null);
+
+                $existingProperties = get_object_vars($proxy);
+
+                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                    if ( ! array_key_exists($property, $existingProperties)) {
+                        $proxy->$property = $defaultValue;
+                    }
+                }
+            };
+
+        }
+    }
+
+    /**
+     * 
+     */
+    public function __clone()
+    {
+        $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', []);
+    }
+
+    /**
+     * Forces initialization of the proxy
+     */
+    public function __load()
+    {
+        $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', []);
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __isInitialized()
+    {
+        return $this->__isInitialized__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitialized($initialized)
+    {
+        $this->__isInitialized__ = $initialized;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitializer(\Closure $initializer = null)
+    {
+        $this->__initializer__ = $initializer;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __getInitializer()
+    {
+        return $this->__initializer__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setCloner(\Closure $cloner = null)
+    {
+        $this->__cloner__ = $cloner;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific cloning logic
+     */
+    public function __getCloner()
+    {
+        return $this->__cloner__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @static
+     */
+    public function __getLazyProperties()
+    {
+        return self::$lazyPropertiesDefaults;
+    }
+
+    
+    /**
+     * {@inheritDoc}
+     */
+    public function getId()
+    {
+        if ($this->__isInitialized__ === false) {
+            return (int)  parent::getId();
+        }
+
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', []);
+
+        return parent::getId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setName($name)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setName', [$name]);
+
+        return parent::setName($name);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getName()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getName', []);
+
+        return parent::getName();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setJobId($jobId)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setJobId', [$jobId]);
+
+        return parent::setJobId($jobId);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getJobId()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getJobId', []);
+
+        return parent::getJobId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setSettings($settings)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setSettings', [$settings]);
+
+        return parent::setSettings($settings);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getSettings()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getSettings', []);
+
+        return parent::getSettings();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setCompleted($completed)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCompleted', [$completed]);
+
+        return parent::setCompleted($completed);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function isCompleted()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'isCompleted', []);
+
+        return parent::isCompleted();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setStatus($status)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setStatus', [$status]);
+
+        return parent::setStatus($status);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getStatus()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getStatus', []);
+
+        return parent::getStatus();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setCrashed($crashed)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCrashed', [$crashed]);
+
+        return parent::setCrashed($crashed);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCrashed()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCrashed', []);
+
+        return parent::getCrashed();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setSingleRun($singleRun)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setSingleRun', [$singleRun]);
+
+        return parent::setSingleRun($singleRun);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function isSingleRun()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'isSingleRun', []);
+
+        return parent::isSingleRun();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setCreated($created)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreated', [$created]);
+
+        return parent::setCreated($created);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCreated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreated', []);
+
+        return parent::getCreated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setUpdated($updated)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUpdated', [$updated]);
+
+        return parent::setUpdated($updated);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getUpdated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUpdated', []);
+
+        return parent::getUpdated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setExecuted($lastExecution)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setExecuted', [$lastExecution]);
+
+        return parent::setExecuted($lastExecution);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getLastExecution()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getLastExecution', []);
+
+        return parent::getLastExecution();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getPeriod()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getPeriod', []);
+
+        return parent::getPeriod();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setPeriod($period)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setPeriod', [$period]);
+
+        return parent::setPeriod($period);
+    }
+
+}
--- a/resources/proxies/CGAlchemyPhraseaModelEntitiesToken.php
+++ b/resources/proxies/CGAlchemyPhraseaModelEntitiesToken.php
@@ -0,0 +1,334 @@
+<?php
+
+namespace Alchemy\Phrasea\Model\Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
+
+/**
+ * DO NOT EDIT THIS FILE - IT WAS CREATED BY DOCTRINE'S PROXY GENERATOR
+ */
+class Token extends \Alchemy\Phrasea\Model\Entities\Token implements \Doctrine\ORM\Proxy\Proxy
+{
+    /**
+     * @var \Closure the callback responsible for loading properties in the proxy object. This callback is called with
+     *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
+     *      initialization process and an array of ordered parameters that were passed to that method.
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     */
+    public $__initializer__;
+
+    /**
+     * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     */
+    public $__cloner__;
+
+    /**
+     * @var boolean flag indicating if this object was already initialized
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__isInitialized
+     */
+    public $__isInitialized__ = false;
+
+    /**
+     * @var array properties to be lazy loaded, with keys being the property
+     *            names and values being their default values
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     */
+    public static $lazyPropertiesDefaults = [];
+
+
+
+    /**
+     * @param \Closure $initializer
+     * @param \Closure $cloner
+     */
+    public function __construct($initializer = null, $cloner = null)
+    {
+
+        $this->__initializer__ = $initializer;
+        $this->__cloner__      = $cloner;
+    }
+
+
+
+
+
+
+
+    /**
+     * 
+     * @return array
+     */
+    public function __sleep()
+    {
+        if ($this->__isInitialized__) {
+            return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Token' . "\0" . 'value', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Token' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Token' . "\0" . 'type', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Token' . "\0" . 'data', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Token' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Token' . "\0" . 'updated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Token' . "\0" . 'expiration'];
+        }
+
+        return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Token' . "\0" . 'value', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Token' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Token' . "\0" . 'type', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Token' . "\0" . 'data', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Token' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Token' . "\0" . 'updated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Token' . "\0" . 'expiration'];
+    }
+
+    /**
+     * 
+     */
+    public function __wakeup()
+    {
+        if ( ! $this->__isInitialized__) {
+            $this->__initializer__ = function (Token $proxy) {
+                $proxy->__setInitializer(null);
+                $proxy->__setCloner(null);
+
+                $existingProperties = get_object_vars($proxy);
+
+                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                    if ( ! array_key_exists($property, $existingProperties)) {
+                        $proxy->$property = $defaultValue;
+                    }
+                }
+            };
+
+        }
+    }
+
+    /**
+     * 
+     */
+    public function __clone()
+    {
+        $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', []);
+    }
+
+    /**
+     * Forces initialization of the proxy
+     */
+    public function __load()
+    {
+        $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', []);
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __isInitialized()
+    {
+        return $this->__isInitialized__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitialized($initialized)
+    {
+        $this->__isInitialized__ = $initialized;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitializer(\Closure $initializer = null)
+    {
+        $this->__initializer__ = $initializer;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __getInitializer()
+    {
+        return $this->__initializer__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setCloner(\Closure $cloner = null)
+    {
+        $this->__cloner__ = $cloner;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific cloning logic
+     */
+    public function __getCloner()
+    {
+        return $this->__cloner__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @static
+     */
+    public function __getLazyProperties()
+    {
+        return self::$lazyPropertiesDefaults;
+    }
+
+    
+    /**
+     * {@inheritDoc}
+     */
+    public function setValue($value)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setValue', [$value]);
+
+        return parent::setValue($value);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getValue()
+    {
+        if ($this->__isInitialized__ === false) {
+            return  parent::getValue();
+        }
+
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getValue', []);
+
+        return parent::getValue();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setType($type)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setType', [$type]);
+
+        return parent::setType($type);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getType()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getType', []);
+
+        return parent::getType();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setData($data)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setData', [$data]);
+
+        return parent::setData($data);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getData()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getData', []);
+
+        return parent::getData();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setCreated($created)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreated', [$created]);
+
+        return parent::setCreated($created);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCreated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreated', []);
+
+        return parent::getCreated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setUpdated($updated)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUpdated', [$updated]);
+
+        return parent::setUpdated($updated);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getUpdated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUpdated', []);
+
+        return parent::getUpdated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setExpiration(\DateTime $expiration = NULL)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setExpiration', [$expiration]);
+
+        return parent::setExpiration($expiration);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getExpiration()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getExpiration', []);
+
+        return parent::getExpiration();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setUser(\Alchemy\Phrasea\Model\Entities\User $user = NULL)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUser', [$user]);
+
+        return parent::setUser($user);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getUser()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUser', []);
+
+        return parent::getUser();
+    }
+
+}
--- a/resources/proxies/CGAlchemyPhraseaModelEntitiesUser.php
+++ b/resources/proxies/CGAlchemyPhraseaModelEntitiesUser.php
--- a/resources/proxies/CGAlchemyPhraseaModelEntitiesUserNotificationSetting.php
+++ b/resources/proxies/CGAlchemyPhraseaModelEntitiesUserNotificationSetting.php
@@ -0,0 +1,301 @@
+<?php
+
+namespace Alchemy\Phrasea\Model\Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
+
+/**
+ * DO NOT EDIT THIS FILE - IT WAS CREATED BY DOCTRINE'S PROXY GENERATOR
+ */
+class UserNotificationSetting extends \Alchemy\Phrasea\Model\Entities\UserNotificationSetting implements \Doctrine\ORM\Proxy\Proxy
+{
+    /**
+     * @var \Closure the callback responsible for loading properties in the proxy object. This callback is called with
+     *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
+     *      initialization process and an array of ordered parameters that were passed to that method.
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     */
+    public $__initializer__;
+
+    /**
+     * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     */
+    public $__cloner__;
+
+    /**
+     * @var boolean flag indicating if this object was already initialized
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__isInitialized
+     */
+    public $__isInitialized__ = false;
+
+    /**
+     * @var array properties to be lazy loaded, with keys being the property
+     *            names and values being their default values
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     */
+    public static $lazyPropertiesDefaults = [];
+
+
+
+    /**
+     * @param \Closure $initializer
+     * @param \Closure $cloner
+     */
+    public function __construct($initializer = null, $cloner = null)
+    {
+
+        $this->__initializer__ = $initializer;
+        $this->__cloner__      = $cloner;
+    }
+
+
+
+
+
+
+
+    /**
+     * 
+     * @return array
+     */
+    public function __sleep()
+    {
+        if ($this->__isInitialized__) {
+            return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UserNotificationSetting' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UserNotificationSetting' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UserNotificationSetting' . "\0" . 'name', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UserNotificationSetting' . "\0" . 'value', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UserNotificationSetting' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UserNotificationSetting' . "\0" . 'updated'];
+        }
+
+        return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UserNotificationSetting' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UserNotificationSetting' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UserNotificationSetting' . "\0" . 'name', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UserNotificationSetting' . "\0" . 'value', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UserNotificationSetting' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UserNotificationSetting' . "\0" . 'updated'];
+    }
+
+    /**
+     * 
+     */
+    public function __wakeup()
+    {
+        if ( ! $this->__isInitialized__) {
+            $this->__initializer__ = function (UserNotificationSetting $proxy) {
+                $proxy->__setInitializer(null);
+                $proxy->__setCloner(null);
+
+                $existingProperties = get_object_vars($proxy);
+
+                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                    if ( ! array_key_exists($property, $existingProperties)) {
+                        $proxy->$property = $defaultValue;
+                    }
+                }
+            };
+
+        }
+    }
+
+    /**
+     * 
+     */
+    public function __clone()
+    {
+        $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', []);
+    }
+
+    /**
+     * Forces initialization of the proxy
+     */
+    public function __load()
+    {
+        $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', []);
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __isInitialized()
+    {
+        return $this->__isInitialized__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitialized($initialized)
+    {
+        $this->__isInitialized__ = $initialized;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitializer(\Closure $initializer = null)
+    {
+        $this->__initializer__ = $initializer;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __getInitializer()
+    {
+        return $this->__initializer__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setCloner(\Closure $cloner = null)
+    {
+        $this->__cloner__ = $cloner;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific cloning logic
+     */
+    public function __getCloner()
+    {
+        return $this->__cloner__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @static
+     */
+    public function __getLazyProperties()
+    {
+        return self::$lazyPropertiesDefaults;
+    }
+
+    
+    /**
+     * {@inheritDoc}
+     */
+    public function getId()
+    {
+        if ($this->__isInitialized__ === false) {
+            return (int)  parent::getId();
+        }
+
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', []);
+
+        return parent::getId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getUser()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUser', []);
+
+        return parent::getUser();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setUser(\Alchemy\Phrasea\Model\Entities\User $user)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUser', [$user]);
+
+        return parent::setUser($user);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getName()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getName', []);
+
+        return parent::getName();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setName($name)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setName', [$name]);
+
+        return parent::setName($name);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getValue()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getValue', []);
+
+        return parent::getValue();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setValue($value)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setValue', [$value]);
+
+        return parent::setValue($value);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCreated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreated', []);
+
+        return parent::getCreated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setCreated(\DateTime $created)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreated', [$created]);
+
+        return parent::setCreated($created);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getUpdated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUpdated', []);
+
+        return parent::getUpdated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setUpdated($updated)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUpdated', [$updated]);
+
+        return parent::setUpdated($updated);
+    }
+
+}
--- a/resources/proxies/CGAlchemyPhraseaModelEntitiesUserQuery.php
+++ b/resources/proxies/CGAlchemyPhraseaModelEntitiesUserQuery.php
@@ -0,0 +1,257 @@
+<?php
+
+namespace Alchemy\Phrasea\Model\Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
+
+/**
+ * DO NOT EDIT THIS FILE - IT WAS CREATED BY DOCTRINE'S PROXY GENERATOR
+ */
+class UserQuery extends \Alchemy\Phrasea\Model\Entities\UserQuery implements \Doctrine\ORM\Proxy\Proxy
+{
+    /**
+     * @var \Closure the callback responsible for loading properties in the proxy object. This callback is called with
+     *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
+     *      initialization process and an array of ordered parameters that were passed to that method.
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     */
+    public $__initializer__;
+
+    /**
+     * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     */
+    public $__cloner__;
+
+    /**
+     * @var boolean flag indicating if this object was already initialized
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__isInitialized
+     */
+    public $__isInitialized__ = false;
+
+    /**
+     * @var array properties to be lazy loaded, with keys being the property
+     *            names and values being their default values
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     */
+    public static $lazyPropertiesDefaults = [];
+
+
+
+    /**
+     * @param \Closure $initializer
+     * @param \Closure $cloner
+     */
+    public function __construct($initializer = null, $cloner = null)
+    {
+
+        $this->__initializer__ = $initializer;
+        $this->__cloner__      = $cloner;
+    }
+
+
+
+
+
+
+
+    /**
+     * 
+     * @return array
+     */
+    public function __sleep()
+    {
+        if ($this->__isInitialized__) {
+            return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UserQuery' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UserQuery' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UserQuery' . "\0" . 'query', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UserQuery' . "\0" . 'created'];
+        }
+
+        return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UserQuery' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UserQuery' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UserQuery' . "\0" . 'query', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UserQuery' . "\0" . 'created'];
+    }
+
+    /**
+     * 
+     */
+    public function __wakeup()
+    {
+        if ( ! $this->__isInitialized__) {
+            $this->__initializer__ = function (UserQuery $proxy) {
+                $proxy->__setInitializer(null);
+                $proxy->__setCloner(null);
+
+                $existingProperties = get_object_vars($proxy);
+
+                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                    if ( ! array_key_exists($property, $existingProperties)) {
+                        $proxy->$property = $defaultValue;
+                    }
+                }
+            };
+
+        }
+    }
+
+    /**
+     * 
+     */
+    public function __clone()
+    {
+        $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', []);
+    }
+
+    /**
+     * Forces initialization of the proxy
+     */
+    public function __load()
+    {
+        $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', []);
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __isInitialized()
+    {
+        return $this->__isInitialized__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitialized($initialized)
+    {
+        $this->__isInitialized__ = $initialized;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitializer(\Closure $initializer = null)
+    {
+        $this->__initializer__ = $initializer;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __getInitializer()
+    {
+        return $this->__initializer__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setCloner(\Closure $cloner = null)
+    {
+        $this->__cloner__ = $cloner;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific cloning logic
+     */
+    public function __getCloner()
+    {
+        return $this->__cloner__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @static
+     */
+    public function __getLazyProperties()
+    {
+        return self::$lazyPropertiesDefaults;
+    }
+
+    
+    /**
+     * {@inheritDoc}
+     */
+    public function getId()
+    {
+        if ($this->__isInitialized__ === false) {
+            return (int)  parent::getId();
+        }
+
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', []);
+
+        return parent::getId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getUser()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUser', []);
+
+        return parent::getUser();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setUser(\Alchemy\Phrasea\Model\Entities\User $user)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUser', [$user]);
+
+        return parent::setUser($user);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getQuery()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getQuery', []);
+
+        return parent::getQuery();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setQuery($query)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setQuery', [$query]);
+
+        return parent::setQuery($query);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCreated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreated', []);
+
+        return parent::getCreated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setCreated(\DateTime $created)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreated', [$created]);
+
+        return parent::setCreated($created);
+    }
+
+}
--- a/resources/proxies/CGAlchemyPhraseaModelEntitiesUserSetting.php
+++ b/resources/proxies/CGAlchemyPhraseaModelEntitiesUserSetting.php
@@ -0,0 +1,301 @@
+<?php
+
+namespace Alchemy\Phrasea\Model\Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
+
+/**
+ * DO NOT EDIT THIS FILE - IT WAS CREATED BY DOCTRINE'S PROXY GENERATOR
+ */
+class UserSetting extends \Alchemy\Phrasea\Model\Entities\UserSetting implements \Doctrine\ORM\Proxy\Proxy
+{
+    /**
+     * @var \Closure the callback responsible for loading properties in the proxy object. This callback is called with
+     *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
+     *      initialization process and an array of ordered parameters that were passed to that method.
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     */
+    public $__initializer__;
+
+    /**
+     * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     */
+    public $__cloner__;
+
+    /**
+     * @var boolean flag indicating if this object was already initialized
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__isInitialized
+     */
+    public $__isInitialized__ = false;
+
+    /**
+     * @var array properties to be lazy loaded, with keys being the property
+     *            names and values being their default values
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     */
+    public static $lazyPropertiesDefaults = [];
+
+
+
+    /**
+     * @param \Closure $initializer
+     * @param \Closure $cloner
+     */
+    public function __construct($initializer = null, $cloner = null)
+    {
+
+        $this->__initializer__ = $initializer;
+        $this->__cloner__      = $cloner;
+    }
+
+
+
+
+
+
+
+    /**
+     * 
+     * @return array
+     */
+    public function __sleep()
+    {
+        if ($this->__isInitialized__) {
+            return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UserSetting' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UserSetting' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UserSetting' . "\0" . 'name', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UserSetting' . "\0" . 'value', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UserSetting' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UserSetting' . "\0" . 'updated'];
+        }
+
+        return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UserSetting' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UserSetting' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UserSetting' . "\0" . 'name', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UserSetting' . "\0" . 'value', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UserSetting' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UserSetting' . "\0" . 'updated'];
+    }
+
+    /**
+     * 
+     */
+    public function __wakeup()
+    {
+        if ( ! $this->__isInitialized__) {
+            $this->__initializer__ = function (UserSetting $proxy) {
+                $proxy->__setInitializer(null);
+                $proxy->__setCloner(null);
+
+                $existingProperties = get_object_vars($proxy);
+
+                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                    if ( ! array_key_exists($property, $existingProperties)) {
+                        $proxy->$property = $defaultValue;
+                    }
+                }
+            };
+
+        }
+    }
+
+    /**
+     * 
+     */
+    public function __clone()
+    {
+        $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', []);
+    }
+
+    /**
+     * Forces initialization of the proxy
+     */
+    public function __load()
+    {
+        $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', []);
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __isInitialized()
+    {
+        return $this->__isInitialized__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitialized($initialized)
+    {
+        $this->__isInitialized__ = $initialized;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitializer(\Closure $initializer = null)
+    {
+        $this->__initializer__ = $initializer;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __getInitializer()
+    {
+        return $this->__initializer__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setCloner(\Closure $cloner = null)
+    {
+        $this->__cloner__ = $cloner;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific cloning logic
+     */
+    public function __getCloner()
+    {
+        return $this->__cloner__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @static
+     */
+    public function __getLazyProperties()
+    {
+        return self::$lazyPropertiesDefaults;
+    }
+
+    
+    /**
+     * {@inheritDoc}
+     */
+    public function getId()
+    {
+        if ($this->__isInitialized__ === false) {
+            return (int)  parent::getId();
+        }
+
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', []);
+
+        return parent::getId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getUser()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUser', []);
+
+        return parent::getUser();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setUser(\Alchemy\Phrasea\Model\Entities\User $user)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUser', [$user]);
+
+        return parent::setUser($user);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getName()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getName', []);
+
+        return parent::getName();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setName($name)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setName', [$name]);
+
+        return parent::setName($name);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getValue()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getValue', []);
+
+        return parent::getValue();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setValue($value)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setValue', [$value]);
+
+        return parent::setValue($value);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCreated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreated', []);
+
+        return parent::getCreated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setCreated(\DateTime $created)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreated', [$created]);
+
+        return parent::setCreated($created);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getUpdated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUpdated', []);
+
+        return parent::getUpdated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setUpdated(\DateTime $updated)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUpdated', [$updated]);
+
+        return parent::setUpdated($updated);
+    }
+
+}
--- a/resources/proxies/CGAlchemyPhraseaModelEntitiesUsrAuthProvider.php
+++ b/resources/proxies/CGAlchemyPhraseaModelEntitiesUsrAuthProvider.php
@@ -0,0 +1,301 @@
+<?php
+
+namespace Alchemy\Phrasea\Model\Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
+
+/**
+ * DO NOT EDIT THIS FILE - IT WAS CREATED BY DOCTRINE'S PROXY GENERATOR
+ */
+class UsrAuthProvider extends \Alchemy\Phrasea\Model\Entities\UsrAuthProvider implements \Doctrine\ORM\Proxy\Proxy
+{
+    /**
+     * @var \Closure the callback responsible for loading properties in the proxy object. This callback is called with
+     *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
+     *      initialization process and an array of ordered parameters that were passed to that method.
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     */
+    public $__initializer__;
+
+    /**
+     * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     */
+    public $__cloner__;
+
+    /**
+     * @var boolean flag indicating if this object was already initialized
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__isInitialized
+     */
+    public $__isInitialized__ = false;
+
+    /**
+     * @var array properties to be lazy loaded, with keys being the property
+     *            names and values being their default values
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     */
+    public static $lazyPropertiesDefaults = [];
+
+
+
+    /**
+     * @param \Closure $initializer
+     * @param \Closure $cloner
+     */
+    public function __construct($initializer = null, $cloner = null)
+    {
+
+        $this->__initializer__ = $initializer;
+        $this->__cloner__      = $cloner;
+    }
+
+
+
+
+
+
+
+    /**
+     * 
+     * @return array
+     */
+    public function __sleep()
+    {
+        if ($this->__isInitialized__) {
+            return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrAuthProvider' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrAuthProvider' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrAuthProvider' . "\0" . 'provider', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrAuthProvider' . "\0" . 'distant_id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrAuthProvider' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrAuthProvider' . "\0" . 'updated'];
+        }
+
+        return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrAuthProvider' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrAuthProvider' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrAuthProvider' . "\0" . 'provider', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrAuthProvider' . "\0" . 'distant_id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrAuthProvider' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrAuthProvider' . "\0" . 'updated'];
+    }
+
+    /**
+     * 
+     */
+    public function __wakeup()
+    {
+        if ( ! $this->__isInitialized__) {
+            $this->__initializer__ = function (UsrAuthProvider $proxy) {
+                $proxy->__setInitializer(null);
+                $proxy->__setCloner(null);
+
+                $existingProperties = get_object_vars($proxy);
+
+                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                    if ( ! array_key_exists($property, $existingProperties)) {
+                        $proxy->$property = $defaultValue;
+                    }
+                }
+            };
+
+        }
+    }
+
+    /**
+     * 
+     */
+    public function __clone()
+    {
+        $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', []);
+    }
+
+    /**
+     * Forces initialization of the proxy
+     */
+    public function __load()
+    {
+        $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', []);
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __isInitialized()
+    {
+        return $this->__isInitialized__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitialized($initialized)
+    {
+        $this->__isInitialized__ = $initialized;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitializer(\Closure $initializer = null)
+    {
+        $this->__initializer__ = $initializer;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __getInitializer()
+    {
+        return $this->__initializer__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setCloner(\Closure $cloner = null)
+    {
+        $this->__cloner__ = $cloner;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific cloning logic
+     */
+    public function __getCloner()
+    {
+        return $this->__cloner__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @static
+     */
+    public function __getLazyProperties()
+    {
+        return self::$lazyPropertiesDefaults;
+    }
+
+    
+    /**
+     * {@inheritDoc}
+     */
+    public function getId()
+    {
+        if ($this->__isInitialized__ === false) {
+            return (int)  parent::getId();
+        }
+
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', []);
+
+        return parent::getId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setUser(\Alchemy\Phrasea\Model\Entities\User $user)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUser', [$user]);
+
+        return parent::setUser($user);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getUser()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUser', []);
+
+        return parent::getUser();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setProvider($provider)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setProvider', [$provider]);
+
+        return parent::setProvider($provider);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getProvider()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getProvider', []);
+
+        return parent::getProvider();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setDistantId($distantId)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setDistantId', [$distantId]);
+
+        return parent::setDistantId($distantId);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getDistantId()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getDistantId', []);
+
+        return parent::getDistantId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setUpdated(\DateTime $updated)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUpdated', [$updated]);
+
+        return parent::setUpdated($updated);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getUpdated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUpdated', []);
+
+        return parent::getUpdated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setCreated(\DateTime $created)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreated', [$created]);
+
+        return parent::setCreated($created);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCreated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreated', []);
+
+        return parent::getCreated();
+    }
+
+}
--- a/resources/proxies/CGAlchemyPhraseaModelEntitiesUsrList.php
+++ b/resources/proxies/CGAlchemyPhraseaModelEntitiesUsrList.php
@@ -0,0 +1,356 @@
+<?php
+
+namespace Alchemy\Phrasea\Model\Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
+
+/**
+ * DO NOT EDIT THIS FILE - IT WAS CREATED BY DOCTRINE'S PROXY GENERATOR
+ */
+class UsrList extends \Alchemy\Phrasea\Model\Entities\UsrList implements \Doctrine\ORM\Proxy\Proxy
+{
+    /**
+     * @var \Closure the callback responsible for loading properties in the proxy object. This callback is called with
+     *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
+     *      initialization process and an array of ordered parameters that were passed to that method.
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     */
+    public $__initializer__;
+
+    /**
+     * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     */
+    public $__cloner__;
+
+    /**
+     * @var boolean flag indicating if this object was already initialized
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__isInitialized
+     */
+    public $__isInitialized__ = false;
+
+    /**
+     * @var array properties to be lazy loaded, with keys being the property
+     *            names and values being their default values
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     */
+    public static $lazyPropertiesDefaults = [];
+
+
+
+    /**
+     * @param \Closure $initializer
+     * @param \Closure $cloner
+     */
+    public function __construct($initializer = null, $cloner = null)
+    {
+
+        $this->__initializer__ = $initializer;
+        $this->__cloner__      = $cloner;
+    }
+
+
+
+
+
+
+
+    /**
+     * 
+     * @return array
+     */
+    public function __sleep()
+    {
+        if ($this->__isInitialized__) {
+            return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrList' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrList' . "\0" . 'name', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrList' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrList' . "\0" . 'updated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrList' . "\0" . 'owners', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrList' . "\0" . 'entries'];
+        }
+
+        return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrList' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrList' . "\0" . 'name', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrList' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrList' . "\0" . 'updated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrList' . "\0" . 'owners', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrList' . "\0" . 'entries'];
+    }
+
+    /**
+     * 
+     */
+    public function __wakeup()
+    {
+        if ( ! $this->__isInitialized__) {
+            $this->__initializer__ = function (UsrList $proxy) {
+                $proxy->__setInitializer(null);
+                $proxy->__setCloner(null);
+
+                $existingProperties = get_object_vars($proxy);
+
+                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                    if ( ! array_key_exists($property, $existingProperties)) {
+                        $proxy->$property = $defaultValue;
+                    }
+                }
+            };
+
+        }
+    }
+
+    /**
+     * 
+     */
+    public function __clone()
+    {
+        $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', []);
+    }
+
+    /**
+     * Forces initialization of the proxy
+     */
+    public function __load()
+    {
+        $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', []);
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __isInitialized()
+    {
+        return $this->__isInitialized__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitialized($initialized)
+    {
+        $this->__isInitialized__ = $initialized;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitializer(\Closure $initializer = null)
+    {
+        $this->__initializer__ = $initializer;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __getInitializer()
+    {
+        return $this->__initializer__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setCloner(\Closure $cloner = null)
+    {
+        $this->__cloner__ = $cloner;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific cloning logic
+     */
+    public function __getCloner()
+    {
+        return $this->__cloner__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @static
+     */
+    public function __getLazyProperties()
+    {
+        return self::$lazyPropertiesDefaults;
+    }
+
+    
+    /**
+     * {@inheritDoc}
+     */
+    public function getId()
+    {
+        if ($this->__isInitialized__ === false) {
+            return (int)  parent::getId();
+        }
+
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', []);
+
+        return parent::getId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setName($name)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setName', [$name]);
+
+        return parent::setName($name);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getName()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getName', []);
+
+        return parent::getName();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setCreated(\DateTime $created)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreated', [$created]);
+
+        return parent::setCreated($created);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCreated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreated', []);
+
+        return parent::getCreated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setUpdated(\DateTime $updated)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUpdated', [$updated]);
+
+        return parent::setUpdated($updated);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getUpdated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUpdated', []);
+
+        return parent::getUpdated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function addOwner(\Alchemy\Phrasea\Model\Entities\UsrListOwner $owners)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'addOwner', [$owners]);
+
+        return parent::addOwner($owners);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function removeOwner(\Alchemy\Phrasea\Model\Entities\UsrListOwner $owners)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'removeOwner', [$owners]);
+
+        return parent::removeOwner($owners);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getOwners()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getOwners', []);
+
+        return parent::getOwners();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function addEntrie(\Alchemy\Phrasea\Model\Entities\UsrListEntry $entries)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'addEntrie', [$entries]);
+
+        return parent::addEntrie($entries);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function removeEntrie(\Alchemy\Phrasea\Model\Entities\UsrListEntry $entries)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'removeEntrie', [$entries]);
+
+        return parent::removeEntrie($entries);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getEntries()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getEntries', []);
+
+        return parent::getEntries();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function hasAccess(\Alchemy\Phrasea\Model\Entities\User $user)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'hasAccess', [$user]);
+
+        return parent::hasAccess($user);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getOwner(\Alchemy\Phrasea\Model\Entities\User $user)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getOwner', [$user]);
+
+        return parent::getOwner($user);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function has(\Alchemy\Phrasea\Model\Entities\User $user)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'has', [$user]);
+
+        return parent::has($user);
+    }
+
+}
--- a/resources/proxies/CGAlchemyPhraseaModelEntitiesUsrListEntry.php
+++ b/resources/proxies/CGAlchemyPhraseaModelEntitiesUsrListEntry.php
@@ -0,0 +1,279 @@
+<?php
+
+namespace Alchemy\Phrasea\Model\Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
+
+/**
+ * DO NOT EDIT THIS FILE - IT WAS CREATED BY DOCTRINE'S PROXY GENERATOR
+ */
+class UsrListEntry extends \Alchemy\Phrasea\Model\Entities\UsrListEntry implements \Doctrine\ORM\Proxy\Proxy
+{
+    /**
+     * @var \Closure the callback responsible for loading properties in the proxy object. This callback is called with
+     *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
+     *      initialization process and an array of ordered parameters that were passed to that method.
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     */
+    public $__initializer__;
+
+    /**
+     * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     */
+    public $__cloner__;
+
+    /**
+     * @var boolean flag indicating if this object was already initialized
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__isInitialized
+     */
+    public $__isInitialized__ = false;
+
+    /**
+     * @var array properties to be lazy loaded, with keys being the property
+     *            names and values being their default values
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     */
+    public static $lazyPropertiesDefaults = [];
+
+
+
+    /**
+     * @param \Closure $initializer
+     * @param \Closure $cloner
+     */
+    public function __construct($initializer = null, $cloner = null)
+    {
+
+        $this->__initializer__ = $initializer;
+        $this->__cloner__      = $cloner;
+    }
+
+
+
+
+
+
+
+    /**
+     * 
+     * @return array
+     */
+    public function __sleep()
+    {
+        if ($this->__isInitialized__) {
+            return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrListEntry' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrListEntry' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrListEntry' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrListEntry' . "\0" . 'updated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrListEntry' . "\0" . 'list'];
+        }
+
+        return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrListEntry' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrListEntry' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrListEntry' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrListEntry' . "\0" . 'updated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrListEntry' . "\0" . 'list'];
+    }
+
+    /**
+     * 
+     */
+    public function __wakeup()
+    {
+        if ( ! $this->__isInitialized__) {
+            $this->__initializer__ = function (UsrListEntry $proxy) {
+                $proxy->__setInitializer(null);
+                $proxy->__setCloner(null);
+
+                $existingProperties = get_object_vars($proxy);
+
+                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                    if ( ! array_key_exists($property, $existingProperties)) {
+                        $proxy->$property = $defaultValue;
+                    }
+                }
+            };
+
+        }
+    }
+
+    /**
+     * 
+     */
+    public function __clone()
+    {
+        $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', []);
+    }
+
+    /**
+     * Forces initialization of the proxy
+     */
+    public function __load()
+    {
+        $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', []);
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __isInitialized()
+    {
+        return $this->__isInitialized__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitialized($initialized)
+    {
+        $this->__isInitialized__ = $initialized;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitializer(\Closure $initializer = null)
+    {
+        $this->__initializer__ = $initializer;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __getInitializer()
+    {
+        return $this->__initializer__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setCloner(\Closure $cloner = null)
+    {
+        $this->__cloner__ = $cloner;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific cloning logic
+     */
+    public function __getCloner()
+    {
+        return $this->__cloner__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @static
+     */
+    public function __getLazyProperties()
+    {
+        return self::$lazyPropertiesDefaults;
+    }
+
+    
+    /**
+     * {@inheritDoc}
+     */
+    public function getId()
+    {
+        if ($this->__isInitialized__ === false) {
+            return (int)  parent::getId();
+        }
+
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', []);
+
+        return parent::getId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setUser(\Alchemy\Phrasea\Model\Entities\User $user)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUser', [$user]);
+
+        return parent::setUser($user);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getUser()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUser', []);
+
+        return parent::getUser();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setCreated(\DateTime $created)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreated', [$created]);
+
+        return parent::setCreated($created);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCreated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreated', []);
+
+        return parent::getCreated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setUpdated(\DateTime $updated)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUpdated', [$updated]);
+
+        return parent::setUpdated($updated);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getUpdated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUpdated', []);
+
+        return parent::getUpdated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setList(\Alchemy\Phrasea\Model\Entities\UsrList $list = NULL)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setList', [$list]);
+
+        return parent::setList($list);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getList()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getList', []);
+
+        return parent::getList();
+    }
+
+}
--- a/resources/proxies/CGAlchemyPhraseaModelEntitiesUsrListOwner.php
+++ b/resources/proxies/CGAlchemyPhraseaModelEntitiesUsrListOwner.php
@@ -0,0 +1,301 @@
+<?php
+
+namespace Alchemy\Phrasea\Model\Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
+
+/**
+ * DO NOT EDIT THIS FILE - IT WAS CREATED BY DOCTRINE'S PROXY GENERATOR
+ */
+class UsrListOwner extends \Alchemy\Phrasea\Model\Entities\UsrListOwner implements \Doctrine\ORM\Proxy\Proxy
+{
+    /**
+     * @var \Closure the callback responsible for loading properties in the proxy object. This callback is called with
+     *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
+     *      initialization process and an array of ordered parameters that were passed to that method.
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     */
+    public $__initializer__;
+
+    /**
+     * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     */
+    public $__cloner__;
+
+    /**
+     * @var boolean flag indicating if this object was already initialized
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__isInitialized
+     */
+    public $__isInitialized__ = false;
+
+    /**
+     * @var array properties to be lazy loaded, with keys being the property
+     *            names and values being their default values
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     */
+    public static $lazyPropertiesDefaults = [];
+
+
+
+    /**
+     * @param \Closure $initializer
+     * @param \Closure $cloner
+     */
+    public function __construct($initializer = null, $cloner = null)
+    {
+
+        $this->__initializer__ = $initializer;
+        $this->__cloner__      = $cloner;
+    }
+
+
+
+
+
+
+
+    /**
+     * 
+     * @return array
+     */
+    public function __sleep()
+    {
+        if ($this->__isInitialized__) {
+            return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrListOwner' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrListOwner' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrListOwner' . "\0" . 'role', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrListOwner' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrListOwner' . "\0" . 'updated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrListOwner' . "\0" . 'list'];
+        }
+
+        return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrListOwner' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrListOwner' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrListOwner' . "\0" . 'role', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrListOwner' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrListOwner' . "\0" . 'updated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrListOwner' . "\0" . 'list'];
+    }
+
+    /**
+     * 
+     */
+    public function __wakeup()
+    {
+        if ( ! $this->__isInitialized__) {
+            $this->__initializer__ = function (UsrListOwner $proxy) {
+                $proxy->__setInitializer(null);
+                $proxy->__setCloner(null);
+
+                $existingProperties = get_object_vars($proxy);
+
+                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                    if ( ! array_key_exists($property, $existingProperties)) {
+                        $proxy->$property = $defaultValue;
+                    }
+                }
+            };
+
+        }
+    }
+
+    /**
+     * 
+     */
+    public function __clone()
+    {
+        $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', []);
+    }
+
+    /**
+     * Forces initialization of the proxy
+     */
+    public function __load()
+    {
+        $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', []);
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __isInitialized()
+    {
+        return $this->__isInitialized__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitialized($initialized)
+    {
+        $this->__isInitialized__ = $initialized;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitializer(\Closure $initializer = null)
+    {
+        $this->__initializer__ = $initializer;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __getInitializer()
+    {
+        return $this->__initializer__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setCloner(\Closure $cloner = null)
+    {
+        $this->__cloner__ = $cloner;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific cloning logic
+     */
+    public function __getCloner()
+    {
+        return $this->__cloner__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @static
+     */
+    public function __getLazyProperties()
+    {
+        return self::$lazyPropertiesDefaults;
+    }
+
+    
+    /**
+     * {@inheritDoc}
+     */
+    public function getId()
+    {
+        if ($this->__isInitialized__ === false) {
+            return (int)  parent::getId();
+        }
+
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', []);
+
+        return parent::getId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setUser(\Alchemy\Phrasea\Model\Entities\User $user)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUser', [$user]);
+
+        return parent::setUser($user);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getUser()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUser', []);
+
+        return parent::getUser();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setRole($role)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setRole', [$role]);
+
+        return parent::setRole($role);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getRole()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getRole', []);
+
+        return parent::getRole();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setCreated(\DateTime $created)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreated', [$created]);
+
+        return parent::setCreated($created);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCreated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreated', []);
+
+        return parent::getCreated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setUpdated(\DateTime $updated)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUpdated', [$updated]);
+
+        return parent::setUpdated($updated);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getUpdated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUpdated', []);
+
+        return parent::getUpdated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setList(\Alchemy\Phrasea\Model\Entities\UsrList $list = NULL)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setList', [$list]);
+
+        return parent::setList($list);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getList()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getList', []);
+
+        return parent::getList();
+    }
+
+}
--- a/resources/proxies/CGAlchemyPhraseaModelEntitiesValidationData.php
+++ b/resources/proxies/CGAlchemyPhraseaModelEntitiesValidationData.php
@@ -0,0 +1,301 @@
+<?php
+
+namespace Alchemy\Phrasea\Model\Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
+
+/**
+ * DO NOT EDIT THIS FILE - IT WAS CREATED BY DOCTRINE'S PROXY GENERATOR
+ */
+class ValidationData extends \Alchemy\Phrasea\Model\Entities\ValidationData implements \Doctrine\ORM\Proxy\Proxy
+{
+    /**
+     * @var \Closure the callback responsible for loading properties in the proxy object. This callback is called with
+     *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
+     *      initialization process and an array of ordered parameters that were passed to that method.
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     */
+    public $__initializer__;
+
+    /**
+     * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     */
+    public $__cloner__;
+
+    /**
+     * @var boolean flag indicating if this object was already initialized
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__isInitialized
+     */
+    public $__isInitialized__ = false;
+
+    /**
+     * @var array properties to be lazy loaded, with keys being the property
+     *            names and values being their default values
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     */
+    public static $lazyPropertiesDefaults = [];
+
+
+
+    /**
+     * @param \Closure $initializer
+     * @param \Closure $cloner
+     */
+    public function __construct($initializer = null, $cloner = null)
+    {
+
+        $this->__initializer__ = $initializer;
+        $this->__cloner__      = $cloner;
+    }
+
+
+
+
+
+
+
+    /**
+     * 
+     * @return array
+     */
+    public function __sleep()
+    {
+        if ($this->__isInitialized__) {
+            return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationData' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationData' . "\0" . 'agreement', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationData' . "\0" . 'note', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationData' . "\0" . 'updated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationData' . "\0" . 'participant', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationData' . "\0" . 'basket_element'];
+        }
+
+        return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationData' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationData' . "\0" . 'agreement', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationData' . "\0" . 'note', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationData' . "\0" . 'updated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationData' . "\0" . 'participant', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationData' . "\0" . 'basket_element'];
+    }
+
+    /**
+     * 
+     */
+    public function __wakeup()
+    {
+        if ( ! $this->__isInitialized__) {
+            $this->__initializer__ = function (ValidationData $proxy) {
+                $proxy->__setInitializer(null);
+                $proxy->__setCloner(null);
+
+                $existingProperties = get_object_vars($proxy);
+
+                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                    if ( ! array_key_exists($property, $existingProperties)) {
+                        $proxy->$property = $defaultValue;
+                    }
+                }
+            };
+
+        }
+    }
+
+    /**
+     * 
+     */
+    public function __clone()
+    {
+        $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', []);
+    }
+
+    /**
+     * Forces initialization of the proxy
+     */
+    public function __load()
+    {
+        $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', []);
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __isInitialized()
+    {
+        return $this->__isInitialized__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitialized($initialized)
+    {
+        $this->__isInitialized__ = $initialized;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitializer(\Closure $initializer = null)
+    {
+        $this->__initializer__ = $initializer;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __getInitializer()
+    {
+        return $this->__initializer__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setCloner(\Closure $cloner = null)
+    {
+        $this->__cloner__ = $cloner;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific cloning logic
+     */
+    public function __getCloner()
+    {
+        return $this->__cloner__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @static
+     */
+    public function __getLazyProperties()
+    {
+        return self::$lazyPropertiesDefaults;
+    }
+
+    
+    /**
+     * {@inheritDoc}
+     */
+    public function getId()
+    {
+        if ($this->__isInitialized__ === false) {
+            return (int)  parent::getId();
+        }
+
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', []);
+
+        return parent::getId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setAgreement($agreement)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setAgreement', [$agreement]);
+
+        return parent::setAgreement($agreement);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getAgreement()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getAgreement', []);
+
+        return parent::getAgreement();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setNote($note)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setNote', [$note]);
+
+        return parent::setNote($note);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getNote()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getNote', []);
+
+        return parent::getNote();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setUpdated(\DateTime $updated)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUpdated', [$updated]);
+
+        return parent::setUpdated($updated);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getUpdated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUpdated', []);
+
+        return parent::getUpdated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setParticipant(\Alchemy\Phrasea\Model\Entities\ValidationParticipant $participant = NULL)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setParticipant', [$participant]);
+
+        return parent::setParticipant($participant);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getParticipant()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getParticipant', []);
+
+        return parent::getParticipant();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setBasketElement(\Alchemy\Phrasea\Model\Entities\BasketElement $basketElement = NULL)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setBasketElement', [$basketElement]);
+
+        return parent::setBasketElement($basketElement);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getBasketElement()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getBasketElement', []);
+
+        return parent::getBasketElement();
+    }
+
+}
--- a/resources/proxies/CGAlchemyPhraseaModelEntitiesValidationParticipant.php
+++ b/resources/proxies/CGAlchemyPhraseaModelEntitiesValidationParticipant.php
@@ -0,0 +1,389 @@
+<?php
+
+namespace Alchemy\Phrasea\Model\Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
+
+/**
+ * DO NOT EDIT THIS FILE - IT WAS CREATED BY DOCTRINE'S PROXY GENERATOR
+ */
+class ValidationParticipant extends \Alchemy\Phrasea\Model\Entities\ValidationParticipant implements \Doctrine\ORM\Proxy\Proxy
+{
+    /**
+     * @var \Closure the callback responsible for loading properties in the proxy object. This callback is called with
+     *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
+     *      initialization process and an array of ordered parameters that were passed to that method.
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     */
+    public $__initializer__;
+
+    /**
+     * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     */
+    public $__cloner__;
+
+    /**
+     * @var boolean flag indicating if this object was already initialized
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__isInitialized
+     */
+    public $__isInitialized__ = false;
+
+    /**
+     * @var array properties to be lazy loaded, with keys being the property
+     *            names and values being their default values
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     */
+    public static $lazyPropertiesDefaults = [];
+
+
+
+    /**
+     * @param \Closure $initializer
+     * @param \Closure $cloner
+     */
+    public function __construct($initializer = null, $cloner = null)
+    {
+
+        $this->__initializer__ = $initializer;
+        $this->__cloner__      = $cloner;
+    }
+
+
+
+
+
+
+
+    /**
+     * 
+     * @return array
+     */
+    public function __sleep()
+    {
+        if ($this->__isInitialized__) {
+            return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationParticipant' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationParticipant' . "\0" . 'is_aware', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationParticipant' . "\0" . 'is_confirmed', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationParticipant' . "\0" . 'can_agree', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationParticipant' . "\0" . 'can_see_others', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationParticipant' . "\0" . 'reminded', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationParticipant' . "\0" . 'datas', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationParticipant' . "\0" . 'session', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationParticipant' . "\0" . 'user'];
+        }
+
+        return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationParticipant' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationParticipant' . "\0" . 'is_aware', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationParticipant' . "\0" . 'is_confirmed', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationParticipant' . "\0" . 'can_agree', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationParticipant' . "\0" . 'can_see_others', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationParticipant' . "\0" . 'reminded', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationParticipant' . "\0" . 'datas', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationParticipant' . "\0" . 'session', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationParticipant' . "\0" . 'user'];
+    }
+
+    /**
+     * 
+     */
+    public function __wakeup()
+    {
+        if ( ! $this->__isInitialized__) {
+            $this->__initializer__ = function (ValidationParticipant $proxy) {
+                $proxy->__setInitializer(null);
+                $proxy->__setCloner(null);
+
+                $existingProperties = get_object_vars($proxy);
+
+                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                    if ( ! array_key_exists($property, $existingProperties)) {
+                        $proxy->$property = $defaultValue;
+                    }
+                }
+            };
+
+        }
+    }
+
+    /**
+     * 
+     */
+    public function __clone()
+    {
+        $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', []);
+    }
+
+    /**
+     * Forces initialization of the proxy
+     */
+    public function __load()
+    {
+        $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', []);
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __isInitialized()
+    {
+        return $this->__isInitialized__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitialized($initialized)
+    {
+        $this->__isInitialized__ = $initialized;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitializer(\Closure $initializer = null)
+    {
+        $this->__initializer__ = $initializer;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __getInitializer()
+    {
+        return $this->__initializer__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setCloner(\Closure $cloner = null)
+    {
+        $this->__cloner__ = $cloner;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific cloning logic
+     */
+    public function __getCloner()
+    {
+        return $this->__cloner__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @static
+     */
+    public function __getLazyProperties()
+    {
+        return self::$lazyPropertiesDefaults;
+    }
+
+    
+    /**
+     * {@inheritDoc}
+     */
+    public function getId()
+    {
+        if ($this->__isInitialized__ === false) {
+            return (int)  parent::getId();
+        }
+
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', []);
+
+        return parent::getId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setUser(\Alchemy\Phrasea\Model\Entities\User $user)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUser', [$user]);
+
+        return parent::setUser($user);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getUser()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUser', []);
+
+        return parent::getUser();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setIsAware($isAware)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setIsAware', [$isAware]);
+
+        return parent::setIsAware($isAware);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getIsAware()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getIsAware', []);
+
+        return parent::getIsAware();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setIsConfirmed($isConfirmed)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setIsConfirmed', [$isConfirmed]);
+
+        return parent::setIsConfirmed($isConfirmed);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getIsConfirmed()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getIsConfirmed', []);
+
+        return parent::getIsConfirmed();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setCanAgree($canAgree)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCanAgree', [$canAgree]);
+
+        return parent::setCanAgree($canAgree);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCanAgree()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCanAgree', []);
+
+        return parent::getCanAgree();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setCanSeeOthers($canSeeOthers)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCanSeeOthers', [$canSeeOthers]);
+
+        return parent::setCanSeeOthers($canSeeOthers);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCanSeeOthers()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCanSeeOthers', []);
+
+        return parent::getCanSeeOthers();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setReminded($reminded)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setReminded', [$reminded]);
+
+        return parent::setReminded($reminded);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getReminded()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getReminded', []);
+
+        return parent::getReminded();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function addData(\Alchemy\Phrasea\Model\Entities\ValidationData $datas)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'addData', [$datas]);
+
+        return parent::addData($datas);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function removeData(\Alchemy\Phrasea\Model\Entities\ValidationData $datas)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'removeData', [$datas]);
+
+        return parent::removeData($datas);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getDatas()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getDatas', []);
+
+        return parent::getDatas();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setSession(\Alchemy\Phrasea\Model\Entities\ValidationSession $session = NULL)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setSession', [$session]);
+
+        return parent::setSession($session);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getSession()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getSession', []);
+
+        return parent::getSession();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function isReleasable()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'isReleasable', []);
+
+        return parent::isReleasable();
+    }
+
+}
--- a/resources/proxies/CGAlchemyPhraseaModelEntitiesValidationSession.php
+++ b/resources/proxies/CGAlchemyPhraseaModelEntitiesValidationSession.php
@@ -0,0 +1,378 @@
+<?php
+
+namespace Alchemy\Phrasea\Model\Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
+
+/**
+ * DO NOT EDIT THIS FILE - IT WAS CREATED BY DOCTRINE'S PROXY GENERATOR
+ */
+class ValidationSession extends \Alchemy\Phrasea\Model\Entities\ValidationSession implements \Doctrine\ORM\Proxy\Proxy
+{
+    /**
+     * @var \Closure the callback responsible for loading properties in the proxy object. This callback is called with
+     *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
+     *      initialization process and an array of ordered parameters that were passed to that method.
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     */
+    public $__initializer__;
+
+    /**
+     * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     */
+    public $__cloner__;
+
+    /**
+     * @var boolean flag indicating if this object was already initialized
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__isInitialized
+     */
+    public $__isInitialized__ = false;
+
+    /**
+     * @var array properties to be lazy loaded, with keys being the property
+     *            names and values being their default values
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     */
+    public static $lazyPropertiesDefaults = [];
+
+
+
+    /**
+     * @param \Closure $initializer
+     * @param \Closure $cloner
+     */
+    public function __construct($initializer = null, $cloner = null)
+    {
+
+        $this->__initializer__ = $initializer;
+        $this->__cloner__      = $cloner;
+    }
+
+
+
+
+
+
+
+    /**
+     * 
+     * @return array
+     */
+    public function __sleep()
+    {
+        if ($this->__isInitialized__) {
+            return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationSession' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationSession' . "\0" . 'initiator', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationSession' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationSession' . "\0" . 'updated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationSession' . "\0" . 'expires', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationSession' . "\0" . 'basket', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationSession' . "\0" . 'participants'];
+        }
+
+        return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationSession' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationSession' . "\0" . 'initiator', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationSession' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationSession' . "\0" . 'updated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationSession' . "\0" . 'expires', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationSession' . "\0" . 'basket', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationSession' . "\0" . 'participants'];
+    }
+
+    /**
+     * 
+     */
+    public function __wakeup()
+    {
+        if ( ! $this->__isInitialized__) {
+            $this->__initializer__ = function (ValidationSession $proxy) {
+                $proxy->__setInitializer(null);
+                $proxy->__setCloner(null);
+
+                $existingProperties = get_object_vars($proxy);
+
+                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                    if ( ! array_key_exists($property, $existingProperties)) {
+                        $proxy->$property = $defaultValue;
+                    }
+                }
+            };
+
+        }
+    }
+
+    /**
+     * 
+     */
+    public function __clone()
+    {
+        $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', []);
+    }
+
+    /**
+     * Forces initialization of the proxy
+     */
+    public function __load()
+    {
+        $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', []);
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __isInitialized()
+    {
+        return $this->__isInitialized__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitialized($initialized)
+    {
+        $this->__isInitialized__ = $initialized;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitializer(\Closure $initializer = null)
+    {
+        $this->__initializer__ = $initializer;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __getInitializer()
+    {
+        return $this->__initializer__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setCloner(\Closure $cloner = null)
+    {
+        $this->__cloner__ = $cloner;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific cloning logic
+     */
+    public function __getCloner()
+    {
+        return $this->__cloner__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @static
+     */
+    public function __getLazyProperties()
+    {
+        return self::$lazyPropertiesDefaults;
+    }
+
+    
+    /**
+     * {@inheritDoc}
+     */
+    public function getId()
+    {
+        if ($this->__isInitialized__ === false) {
+            return (int)  parent::getId();
+        }
+
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', []);
+
+        return parent::getId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setInitiator(\Alchemy\Phrasea\Model\Entities\User $user)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setInitiator', [$user]);
+
+        return parent::setInitiator($user);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getInitiator()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getInitiator', []);
+
+        return parent::getInitiator();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function isInitiator(\Alchemy\Phrasea\Model\Entities\User $user)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'isInitiator', [$user]);
+
+        return parent::isInitiator($user);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setCreated(\DateTime $created)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreated', [$created]);
+
+        return parent::setCreated($created);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCreated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreated', []);
+
+        return parent::getCreated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setUpdated(\DateTime $updated)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUpdated', [$updated]);
+
+        return parent::setUpdated($updated);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getUpdated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUpdated', []);
+
+        return parent::getUpdated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setExpires($expires)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setExpires', [$expires]);
+
+        return parent::setExpires($expires);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getExpires()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getExpires', []);
+
+        return parent::getExpires();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setBasket(\Alchemy\Phrasea\Model\Entities\Basket $basket = NULL)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setBasket', [$basket]);
+
+        return parent::setBasket($basket);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getBasket()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getBasket', []);
+
+        return parent::getBasket();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function addParticipant(\Alchemy\Phrasea\Model\Entities\ValidationParticipant $participants)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'addParticipant', [$participants]);
+
+        return parent::addParticipant($participants);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function removeParticipant(\Alchemy\Phrasea\Model\Entities\ValidationParticipant $participants)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'removeParticipant', [$participants]);
+
+        return parent::removeParticipant($participants);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getParticipants()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getParticipants', []);
+
+        return parent::getParticipants();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function isFinished()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'isFinished', []);
+
+        return parent::isFinished();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getValidationString(\Alchemy\Phrasea\Application $app, \Alchemy\Phrasea\Model\Entities\User $user)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getValidationString', [$app, $user]);
+
+        return parent::getValidationString($app, $user);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getParticipant(\Alchemy\Phrasea\Model\Entities\User $user)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getParticipant', [$user]);
+
+        return parent::getParticipant($user);
+    }
+
+}
--- a/resources/proxies/CGAlchemyPhraseaModelEntitiesWebhookEvent.php
+++ b/resources/proxies/CGAlchemyPhraseaModelEntitiesWebhookEvent.php
@@ -0,0 +1,301 @@
+<?php
+
+namespace Alchemy\Phrasea\Model\Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
+
+/**
+ * DO NOT EDIT THIS FILE - IT WAS CREATED BY DOCTRINE'S PROXY GENERATOR
+ */
+class WebhookEvent extends \Alchemy\Phrasea\Model\Entities\WebhookEvent implements \Doctrine\ORM\Proxy\Proxy
+{
+    /**
+     * @var \Closure the callback responsible for loading properties in the proxy object. This callback is called with
+     *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
+     *      initialization process and an array of ordered parameters that were passed to that method.
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     */
+    public $__initializer__;
+
+    /**
+     * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     */
+    public $__cloner__;
+
+    /**
+     * @var boolean flag indicating if this object was already initialized
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__isInitialized
+     */
+    public $__isInitialized__ = false;
+
+    /**
+     * @var array properties to be lazy loaded, with keys being the property
+     *            names and values being their default values
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     */
+    public static $lazyPropertiesDefaults = [];
+
+
+
+    /**
+     * @param \Closure $initializer
+     * @param \Closure $cloner
+     */
+    public function __construct($initializer = null, $cloner = null)
+    {
+
+        $this->__initializer__ = $initializer;
+        $this->__cloner__      = $cloner;
+    }
+
+
+
+
+
+
+
+    /**
+     * 
+     * @return array
+     */
+    public function __sleep()
+    {
+        if ($this->__isInitialized__) {
+            return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\WebhookEvent' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\WebhookEvent' . "\0" . 'name', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\WebhookEvent' . "\0" . 'type', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\WebhookEvent' . "\0" . 'data', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\WebhookEvent' . "\0" . 'processed', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\WebhookEvent' . "\0" . 'created'];
+        }
+
+        return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\WebhookEvent' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\WebhookEvent' . "\0" . 'name', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\WebhookEvent' . "\0" . 'type', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\WebhookEvent' . "\0" . 'data', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\WebhookEvent' . "\0" . 'processed', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\WebhookEvent' . "\0" . 'created'];
+    }
+
+    /**
+     * 
+     */
+    public function __wakeup()
+    {
+        if ( ! $this->__isInitialized__) {
+            $this->__initializer__ = function (WebhookEvent $proxy) {
+                $proxy->__setInitializer(null);
+                $proxy->__setCloner(null);
+
+                $existingProperties = get_object_vars($proxy);
+
+                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                    if ( ! array_key_exists($property, $existingProperties)) {
+                        $proxy->$property = $defaultValue;
+                    }
+                }
+            };
+
+        }
+    }
+
+    /**
+     * 
+     */
+    public function __clone()
+    {
+        $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', []);
+    }
+
+    /**
+     * Forces initialization of the proxy
+     */
+    public function __load()
+    {
+        $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', []);
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __isInitialized()
+    {
+        return $this->__isInitialized__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitialized($initialized)
+    {
+        $this->__isInitialized__ = $initialized;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitializer(\Closure $initializer = null)
+    {
+        $this->__initializer__ = $initializer;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __getInitializer()
+    {
+        return $this->__initializer__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setCloner(\Closure $cloner = null)
+    {
+        $this->__cloner__ = $cloner;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific cloning logic
+     */
+    public function __getCloner()
+    {
+        return $this->__cloner__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @static
+     */
+    public function __getLazyProperties()
+    {
+        return self::$lazyPropertiesDefaults;
+    }
+
+    
+    /**
+     * {@inheritDoc}
+     */
+    public function setCreated(\DateTime $created)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreated', [$created]);
+
+        return parent::setCreated($created);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCreated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreated', []);
+
+        return parent::getCreated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getId()
+    {
+        if ($this->__isInitialized__ === false) {
+            return (int)  parent::getId();
+        }
+
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', []);
+
+        return parent::getId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setData(array $data)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setData', [$data]);
+
+        return parent::setData($data);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getData()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getData', []);
+
+        return parent::getData();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setName($name)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setName', [$name]);
+
+        return parent::setName($name);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getName()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getName', []);
+
+        return parent::getName();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setProcessed($processed)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setProcessed', [$processed]);
+
+        return parent::setProcessed($processed);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function isProcessed()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'isProcessed', []);
+
+        return parent::isProcessed();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getType()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getType', []);
+
+        return parent::getType();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setType($type)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setType', [$type]);
+
+        return parent::setType($type);
+    }
+
+}
--- a/resources/proxies/CGAlchemyPhraseaModelEntitiesWebhookEventDelivery.php
+++ b/resources/proxies/CGAlchemyPhraseaModelEntitiesWebhookEventDelivery.php
@@ -0,0 +1,312 @@
+<?php
+
+namespace Alchemy\Phrasea\Model\Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
+
+/**
+ * DO NOT EDIT THIS FILE - IT WAS CREATED BY DOCTRINE'S PROXY GENERATOR
+ */
+class WebhookEventDelivery extends \Alchemy\Phrasea\Model\Entities\WebhookEventDelivery implements \Doctrine\ORM\Proxy\Proxy
+{
+    /**
+     * @var \Closure the callback responsible for loading properties in the proxy object. This callback is called with
+     *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
+     *      initialization process and an array of ordered parameters that were passed to that method.
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     */
+    public $__initializer__;
+
+    /**
+     * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     */
+    public $__cloner__;
+
+    /**
+     * @var boolean flag indicating if this object was already initialized
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__isInitialized
+     */
+    public $__isInitialized__ = false;
+
+    /**
+     * @var array properties to be lazy loaded, with keys being the property
+     *            names and values being their default values
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     */
+    public static $lazyPropertiesDefaults = [];
+
+
+
+    /**
+     * @param \Closure $initializer
+     * @param \Closure $cloner
+     */
+    public function __construct($initializer = null, $cloner = null)
+    {
+
+        $this->__initializer__ = $initializer;
+        $this->__cloner__      = $cloner;
+    }
+
+
+
+
+
+
+
+    /**
+     * 
+     * @return array
+     */
+    public function __sleep()
+    {
+        if ($this->__isInitialized__) {
+            return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\WebhookEventDelivery' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\WebhookEventDelivery' . "\0" . 'application', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\WebhookEventDelivery' . "\0" . 'event', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\WebhookEventDelivery' . "\0" . 'delivered', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\WebhookEventDelivery' . "\0" . 'deliveryTries', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\WebhookEventDelivery' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\WebhookEventDelivery' . "\0" . 'payload'];
+        }
+
+        return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\WebhookEventDelivery' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\WebhookEventDelivery' . "\0" . 'application', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\WebhookEventDelivery' . "\0" . 'event', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\WebhookEventDelivery' . "\0" . 'delivered', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\WebhookEventDelivery' . "\0" . 'deliveryTries', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\WebhookEventDelivery' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\WebhookEventDelivery' . "\0" . 'payload'];
+    }
+
+    /**
+     * 
+     */
+    public function __wakeup()
+    {
+        if ( ! $this->__isInitialized__) {
+            $this->__initializer__ = function (WebhookEventDelivery $proxy) {
+                $proxy->__setInitializer(null);
+                $proxy->__setCloner(null);
+
+                $existingProperties = get_object_vars($proxy);
+
+                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                    if ( ! array_key_exists($property, $existingProperties)) {
+                        $proxy->$property = $defaultValue;
+                    }
+                }
+            };
+
+        }
+    }
+
+    /**
+     * 
+     */
+    public function __clone()
+    {
+        $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', []);
+    }
+
+    /**
+     * Forces initialization of the proxy
+     */
+    public function __load()
+    {
+        $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', []);
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __isInitialized()
+    {
+        return $this->__isInitialized__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitialized($initialized)
+    {
+        $this->__isInitialized__ = $initialized;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitializer(\Closure $initializer = null)
+    {
+        $this->__initializer__ = $initializer;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __getInitializer()
+    {
+        return $this->__initializer__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setCloner(\Closure $cloner = null)
+    {
+        $this->__cloner__ = $cloner;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific cloning logic
+     */
+    public function __getCloner()
+    {
+        return $this->__cloner__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @static
+     */
+    public function __getLazyProperties()
+    {
+        return self::$lazyPropertiesDefaults;
+    }
+
+    
+    /**
+     * {@inheritDoc}
+     */
+    public function setCreated(\DateTime $created)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreated', [$created]);
+
+        return parent::setCreated($created);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCreated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreated', []);
+
+        return parent::getCreated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getId()
+    {
+        if ($this->__isInitialized__ === false) {
+            return (int)  parent::getId();
+        }
+
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', []);
+
+        return parent::getId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setDelivered($delivered)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setDelivered', [$delivered]);
+
+        return parent::setDelivered($delivered);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function isDelivered()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'isDelivered', []);
+
+        return parent::isDelivered();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getDeliveryTries()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getDeliveryTries', []);
+
+        return parent::getDeliveryTries();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setDeliverTries($try)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setDeliverTries', [$try]);
+
+        return parent::setDeliverTries($try);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getThirdPartyApplication()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getThirdPartyApplication', []);
+
+        return parent::getThirdPartyApplication();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setThirdPartyApplication(\Alchemy\Phrasea\Model\Entities\ApiApplication $application)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setThirdPartyApplication', [$application]);
+
+        return parent::setThirdPartyApplication($application);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setWebhookEvent(\Alchemy\Phrasea\Model\Entities\WebhookEvent $event)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setWebhookEvent', [$event]);
+
+        return parent::setWebhookEvent($event);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getWebhookEvent()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getWebhookEvent', []);
+
+        return parent::getWebhookEvent();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getPayload()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getPayload', []);
+
+        return parent::getPayload();
+    }
+
+}
--- a/resources/proxies/CGAlchemyPhraseaModelEntitiesWebhookEventPayload.php
+++ b/resources/proxies/CGAlchemyPhraseaModelEntitiesWebhookEventPayload.php
@@ -0,0 +1,246 @@
+<?php
+
+namespace Alchemy\Phrasea\Model\Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
+
+/**
+ * DO NOT EDIT THIS FILE - IT WAS CREATED BY DOCTRINE'S PROXY GENERATOR
+ */
+class WebhookEventPayload extends \Alchemy\Phrasea\Model\Entities\WebhookEventPayload implements \Doctrine\ORM\Proxy\Proxy
+{
+    /**
+     * @var \Closure the callback responsible for loading properties in the proxy object. This callback is called with
+     *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
+     *      initialization process and an array of ordered parameters that were passed to that method.
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     */
+    public $__initializer__;
+
+    /**
+     * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     */
+    public $__cloner__;
+
+    /**
+     * @var boolean flag indicating if this object was already initialized
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__isInitialized
+     */
+    public $__isInitialized__ = false;
+
+    /**
+     * @var array properties to be lazy loaded, with keys being the property
+     *            names and values being their default values
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     */
+    public static $lazyPropertiesDefaults = [];
+
+
+
+    /**
+     * @param \Closure $initializer
+     * @param \Closure $cloner
+     */
+    public function __construct($initializer = null, $cloner = null)
+    {
+
+        $this->__initializer__ = $initializer;
+        $this->__cloner__      = $cloner;
+    }
+
+
+
+
+
+
+
+    /**
+     * 
+     * @return array
+     */
+    public function __sleep()
+    {
+        if ($this->__isInitialized__) {
+            return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\WebhookEventPayload' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\WebhookEventPayload' . "\0" . 'delivery', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\WebhookEventPayload' . "\0" . 'requestPayload', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\WebhookEventPayload' . "\0" . 'responsePayload', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\WebhookEventPayload' . "\0" . 'statusCode', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\WebhookEventPayload' . "\0" . 'headers'];
+        }
+
+        return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\WebhookEventPayload' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\WebhookEventPayload' . "\0" . 'delivery', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\WebhookEventPayload' . "\0" . 'requestPayload', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\WebhookEventPayload' . "\0" . 'responsePayload', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\WebhookEventPayload' . "\0" . 'statusCode', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\WebhookEventPayload' . "\0" . 'headers'];
+    }
+
+    /**
+     * 
+     */
+    public function __wakeup()
+    {
+        if ( ! $this->__isInitialized__) {
+            $this->__initializer__ = function (WebhookEventPayload $proxy) {
+                $proxy->__setInitializer(null);
+                $proxy->__setCloner(null);
+
+                $existingProperties = get_object_vars($proxy);
+
+                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                    if ( ! array_key_exists($property, $existingProperties)) {
+                        $proxy->$property = $defaultValue;
+                    }
+                }
+            };
+
+        }
+    }
+
+    /**
+     * 
+     */
+    public function __clone()
+    {
+        $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', []);
+    }
+
+    /**
+     * Forces initialization of the proxy
+     */
+    public function __load()
+    {
+        $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', []);
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __isInitialized()
+    {
+        return $this->__isInitialized__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitialized($initialized)
+    {
+        $this->__isInitialized__ = $initialized;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitializer(\Closure $initializer = null)
+    {
+        $this->__initializer__ = $initializer;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __getInitializer()
+    {
+        return $this->__initializer__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setCloner(\Closure $cloner = null)
+    {
+        $this->__cloner__ = $cloner;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific cloning logic
+     */
+    public function __getCloner()
+    {
+        return $this->__cloner__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @static
+     */
+    public function __getLazyProperties()
+    {
+        return self::$lazyPropertiesDefaults;
+    }
+
+    
+    /**
+     * {@inheritDoc}
+     */
+    public function getId()
+    {
+        if ($this->__isInitialized__ === false) {
+            return  parent::getId();
+        }
+
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', []);
+
+        return parent::getId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getDelivery()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getDelivery', []);
+
+        return parent::getDelivery();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getRequestPayload()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getRequestPayload', []);
+
+        return parent::getRequestPayload();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getResponsePayload()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getResponsePayload', []);
+
+        return parent::getResponsePayload();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getStatusCode()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getStatusCode', []);
+
+        return parent::getStatusCode();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getResponseHeaders()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getResponseHeaders', []);
+
+        return parent::getResponseHeaders();
+    }
+
+}
--- a/resources/www/_shared/styles/_main-menu.scss
+++ b/resources/www/_shared/styles/_main-menu.scss
@@ -38,13 +38,13 @@ $mainMenuBottomBorder: none !default;
    display: inline-block !important;
  }
  .show-menu {
-    display: none;
    i {
      font-size: 26px;
      vertical-align: middle;
      color: $mainMenuLinkActiveColor;
    }
    img {
+      display: none;
      margin-top: 5px;
    }
  }
@@ -63,6 +63,9 @@ $mainMenuBottomBorder: none !default;
  #mainLogo {
    margin:0 5px;
    vertical-align: middle;
+    @media screen and (max-width: 1064px) {
+      max-width: 100px;
+    }
  }
  li {
    display: inline-block;
@@ -149,8 +152,10 @@ $mainMenuBottomBorder: none !default;
  }
  #mainMenu {
    .show-menu {
-      display: inline-block;
      cursor: pointer;
+      img {
+        display: inline-block;
+      }
    }
    .mobilemenu {
      display: block;
@@ -160,7 +165,6 @@ $mainMenuBottomBorder: none !default;
    }
    #nav_menu_container, #nav_customlink_container, #nav_account_container {
      position: absolute;
-      top: 35px;
      z-index: 1000;
      .nav_menu {
        z-index: 1000;
@@ -209,13 +213,13 @@ $mainMenuBottomBorder: none !default;
      }
    }
    #nav_menu_container {
-      left: 10px;
+      left: 5px;
      width: 172px;
      .nav_menu {
        top: 9px;
      }
      .arrow-up {
-        left: 52px;
+        left: 5px;
        display: block;
        position: absolute;
      }
@@ -223,7 +227,7 @@ $mainMenuBottomBorder: none !default;
    #nav_customlink_container {
      display: none;
      position: relative;
-      left: 10px;
+      left: 4px;
      width: auto;
      .nav-wrapper-box {
        position: absolute;
@@ -235,19 +239,21 @@ $mainMenuBottomBorder: none !default;
        .nav_menu {
          position: relative;
          li.menu-bar-item {
-            width: 100%;
-            left: 0;
+           /* width: 100%;
+            left: 0;*/
          }
          li.menu-bar-item a {
            > span {
              padding: 0;
              display: inline-block;
+              max-width: 140px;
+              overflow: hidden;
            }
          }
        }
      }
      .arrow-up {
-        left: 82px;
+        left: 5px;
        display: block;
        position: absolute;
      }
@@ -259,12 +265,13 @@ $mainMenuBottomBorder: none !default;
      width: auto;
      .nav-wrapper-box {
        position: absolute;
-        right: 10px;
+        right: -4px;
        background: #d8d8d8;
        border-radius: 5px;
        padding-right: 10px;
        padding-left: 10px;
        top: 9px;
+        width: 200px;
        .nav_menu {
          position: relative;
          li.menu-bar-item {
@@ -275,12 +282,14 @@ $mainMenuBottomBorder: none !default;
            > span {
              padding: 0;
              display: inline-block;
+              max-width: 170px;
+              overflow: hidden;
            }
          }
        }
      }
      .arrow-up {
-        right: 23px;
+        right: 6px;
        display: block;
        position: absolute;
      }
--- a/templates/web/common/menubar.html.twig
+++ b/templates/web/common/menubar.html.twig
@@ -20,7 +20,7 @@
            </li>
            <li class="show-menu" id="toggle-menu-main">
                <img src="/assets/common/images/icons/menu-burger.png"/>
-          </li>
+
                <div id="nav_menu_container" class="desktopmenu">
                    <div class="arrow-up"></div>
                    <ol class="nav_menu">
@@ -90,7 +90,8 @@
                                            {% set link = path('upload_flash_form') %}
                                        {% endif %}

-                                  <a href="{{ link }}" class="uploader-open-action" title="{{ 'Upload' | trans }}">
+                                        <a href="{{ link }}" class="uploader-open-action"
+                                           title="{{ 'Upload' | trans }}">
                                            <img src="/assets/common/images/icons/menu-upload.png" class="mobilemenu"/>
                                            <span>
                                            {{ 'admin::monitor: module upload' | trans }}
@@ -125,18 +126,84 @@
                        {% endif %}
                    </ol>
                </div>
+            </li>
            <li class="show-menu" id="toggle-menu-link">
                <img src="/assets/common/images/icons/menu-web-site.png"/>
-          </li>
-          <li class="show-menu" id="toggle-menu-account" style="float: right;margin-right: 16px;">
-              <img src="/assets/common/images/icons/menu-user.png"/>
-          </li>
-          <div id="nav_customlink_container">
+                <div id="nav_customlink_container" class="mobile-link">
                    <div class="arrow-up"></div>
                    <div class="nav-wrapper-box">
                        <ol class="nav_menu"></ol>
                    </div>
                </div>
+            </li>
+            <li class="show-menu" id="toggle-menu-account" style="float: right;margin-right: 16px;">
+                <img src="/assets/common/images/icons/menu-user.png"/>
+                <div class="PNB right mobilemenu" id="nav_account_container">
+                    <div class="arrow-up"></div>
+                    <div class="nav-wrapper-box">
+                        <ol class="nav_menu">
+
+                            <li class="menu-bar-item">
+                                {% if app.getAuthenticator().isAuthenticated() %}
+                                    {% if app.getAuthenticatedUser().isGuest %}
+                                        <img src="/assets/common/images/icons/menu-name-user.png"/>
+                                        <span>
+                {{ 'Guest' | trans }}
+              </span>
+                                    {% else %}
+                                        <a target="_blank" href="{{ path('account') }}"
+                                           title="{{ 'login:: Mon compte' | trans }}">
+                                            <img src="/assets/common/images/icons/menu-name-user.png"/>
+                                            <span>
+                  {{ app.getAuthenticatedUser().getDisplayName() }}
+                </span>
+                                        </a>
+                                    {% endif %}
+                                {% endif %}
+                            </li>
+                            <li class="menu-bar-item">
+                                {% if app.getAuthenticator().isAuthenticated() %}
+                                    <a href="{{ path('logout', { 'redirect' : '..' ~ app['request'].getPathInfo() }) }}"
+                                       target="_self">
+                                        <img src="/assets/common/images/icons/menu-logout.png"/>
+                                        <span>
+                  {{ 'phraseanet:: deconnection' | trans }}
+                </span>
+                                    </a>
+                                {% endif %}
+                            </li>
+                            <li class="menu-bar-item">
+                                <a target="_blank" href="https://docs.phraseanet.com/4.0/">
+                                    <img src="/assets/common/images/icons/menu-help.png"/>
+                                    <span>
+              {{ 'phraseanet:: aide' | trans }}
+                                        <span style="display:inline-block;cursor:pointer;padding:0;border:none;padding-right:4px;padding-left:4px;"
+                                              id="help-trigger"></span>
+            </span>
+                                </a>
+                            </li>
+                            {% if module is defined and module == "prod" %}
+                                <li class="menu-bar-item">
+                                    <a href="#">
+                                        <img src="/assets/common/images/icons/menu-help.png"/>
+                                        <span style="" class="shortcuts-trigger">
+                        {{ 'phraseanet:: raccourcis clavier' | trans }}
+                    </span>
+                                    </a>
+                                </li>
+                            {% endif %}
+                            <li class="menu-bar-item">
+                                <a href="#">
+                                    <img src="/assets/common/images/icons/menu-help.png"/>
+                                    <span style="" class="infoDialog"
+                                          infos="<div><span style='font-size:18px;'>PHRASEANET</span> {{ app['phraseanet.version'].getName() }} (V{{ app['phraseanet.version'].getNumber() }})</div><div></div><br/><div><a href='http://www.gnu.org/licenses/gpl.html' target='_blank'><img src='http://www.gnu.org/graphics/gplv3-88x31.png' style='vertical-align:middle;'/><span>License GNU GPL v3</span></a></div><br/><div><a href='http://www.phraseanet.com/' target='_blank'>  &copy; Copyright Alchemy 2005-{{ "now"|date("Y") }}</a><p style='margin-top: 10px' ><a href='../../gitlog.txt' target='_blank'>gitlog</a></p></div>">{{ 'phraseanet:: a propos' | trans }}</span>
+                                </a>
+                            </li>
+                        </ol>
+                    </div>
+                </div>
+            </li>
+
        </ol>

    </div>
@@ -232,70 +299,6 @@
            </li>
        {% endif %}
    </div>
-
-    <div class="PNB right mobilemenu" id="nav_account_container">
-        <div class="arrow-up"></div>
-        <div class="nav-wrapper-box">
-            <ol class="nav_menu">
-
-                <li class="menu-bar-item">
-                    {% if app.getAuthenticator().isAuthenticated() %}
-                        {% if app.getAuthenticatedUser().isGuest %}
-                            <img src="/assets/common/images/icons/menu-name-user.png"/>
-                            <span>
-                {{ 'Guest' | trans }}
-              </span>
-                        {% else %}
-                            <a target="_blank" href="{{ path('account') }}" title="{{ 'login:: Mon compte' | trans }}">
-                                <img src="/assets/common/images/icons/menu-name-user.png"/>
-                                <span>
-                  {{ app.getAuthenticatedUser().getDisplayName() }}
-                </span>
-                            </a>
-                        {% endif %}
-                    {% endif %}
-                </li>
-                <li class="menu-bar-item">
-                    {% if app.getAuthenticator().isAuthenticated() %}
-                        <a href="{{ path('logout', { 'redirect' : '..' ~ app['request'].getPathInfo() }) }}"
-                           target="_self">
-                            <img src="/assets/common/images/icons/menu-logout.png"/>
-                            <span>
-                  {{ 'phraseanet:: deconnection' | trans }}
-                </span>
-                        </a>
-                    {% endif %}
-                </li>
-                <li class="menu-bar-item">
-                    <a target="_blank" href="https://docs.phraseanet.com/4.0/">
-                        <img src="/assets/common/images/icons/menu-help.png"/>
-                        <span>
-              {{ 'phraseanet:: aide' | trans }}
-                            <span style="display:inline-block;cursor:pointer;padding:0;border:none;padding-right:4px;padding-left:4px;"
-                                  id="help-trigger"></span>
-            </span>
-                    </a>
-                </li>
-                {% if module is defined and module == "prod" %}
-                    <li class="menu-bar-item">
-                        <a href="#">
-                            <img src="/assets/common/images/icons/menu-help.png"/>
-                            <span style="" class="shortcuts-trigger">
-                        {{ 'phraseanet:: raccourcis clavier' | trans }}
-                    </span>
-                        </a>
-                    </li>
-                {% endif %}
-                <li class="menu-bar-item">
-                    <a href="#">
-                        <img src="/assets/common/images/icons/menu-help.png"/>
-                        <span style="" class="infoDialog"
-                              infos="<div><span style='font-size:18px;'>PHRASEANET</span> {{ app['phraseanet.version'].getName() }} (V{{ app['phraseanet.version'].getNumber() }})</div><div></div><br/><div><a href='http://www.gnu.org/licenses/gpl.html' target='_blank'><img src='http://www.gnu.org/graphics/gplv3-88x31.png' style='vertical-align:middle;'/><span>License GNU GPL v3</span></a></div><br/><div><a href='http://www.phraseanet.com/' target='_blank'>  &copy; Copyright Alchemy 2005-{{ "now"|date("Y") }}</a><p style='margin-top: 10px' ><a href='../../gitlog.txt' target='_blank'>gitlog</a></p></div>">{{ 'phraseanet:: a propos' | trans }}</span>
-                    </a>
-                </li>
-            </ol>
-        </div>
-    </div>
 </div>

 {% if app.getAuthenticator().isAuthenticated()  and module == "prod" %}
@@ -312,9 +315,21 @@
        //seperate array based on location of link
        var seperatedLinksByLocation = _.groupBy(configurationSettingLinks, "linkLocation");

+
        for (key in seperatedLinksByLocation) {
            if (key === 'navigation-bar') {
                var sortedCustomLinks = _.sortBy(seperatedLinksByLocation[key], 'linkOrder');
+                /*show navigation-bar if there is some result*/
+                console.log(sortedCustomLinks);
+
+                $(window).resize(function () {
+                    if (($(window).width() <= 1064) && (sortedCustomLinks != undefined)) {
+                        $('#toggle-menu-link img').show();
+                    } else {
+                        $('#toggle-menu-link img').hide();
+                    }
+                });
+

                _.each(sortedCustomLinks, function (linksData) {
                    if (linksData.linkLanguage == 'all' || linksData.linkLanguage === '{{ app['locale'] }}') {
@@ -353,7 +368,7 @@
            }
        }

-        $('#toggle-menu-main').on('click', function (event) {
+        $('#toggle-menu-main > img').on('click', function (event) {
            $('#nav_menu_container').toggle();
            if ($('#nav_customlink_container').is(":visible")) {
                $('#nav_customlink_container').hide();
@@ -363,7 +378,7 @@
            }
        });

-        $('#toggle-menu-link').on('click', function (event) {
+        $('#toggle-menu-link  > img').on('click', function (event) {
            $('#nav_customlink_container').toggle();
            if ($('#nav_menu_container').is(":visible")) {
                $('#nav_menu_container').hide();
@@ -373,7 +388,7 @@
            }
        });

-        $('#toggle-menu-account').on('click', function (event) {
+        $('#toggle-menu-account > img').on('click', function (event) {
            $('#nav_account_container').toggle();
            if ($('#nav_menu_container').is(":visible")) {
                $('#nav_menu_container').hide();
--- a/templates/web/prod/results/record.html.twig
+++ b/templates/web/prod/results/record.html.twig
@@ -53,10 +53,10 @@
                {% endif %}
            </div>
        </div>
-        <div style="height: 25px; position:relative; text-align:left;">
+        <div class="bottom_actions_holder" style="height: 27px; position:relative; text-align:left;">
            <table class="bottom actions" style="width:100%; table-layout:fixed;">
                <tr>
-                    <td style="text-align:left;text-overflow:ellipsis;overflow:hidden;">
+                    <td class="text-stack-wrapper" style="text-align:left;text-overflow:ellipsis;overflow:hidden;">
                        {% set collectionLogo = collection_logo(record.baseId) %}
                        {% if collectionLogo is empty %}
                        {{ record.collectionName }}
@@ -74,7 +74,7 @@
                    {% endif %}

                    {# drop down options #}
-                    <td style="text-align:right;width:{{l_width}}px;" valign="bottom">
+                    <td class="icon-stack-wrapper" style="text-align:right;width:{{l_width}}px;" valign="bottom">

                        {% if settings.rollover_thumbnail == 'caption' %}
                            {% if record_subdef_url(record, 'preview') is not null and has_access_subdef(record, 'preview') %}
--- a/tests/Alchemy/Tests/Phrasea/ApplicationTest.php
+++ b/tests/Alchemy/Tests/Phrasea/ApplicationTest.php
@@ -152,6 +152,7 @@ class ApplicationTest extends \PhraseanetTestCase
        $sessionId = null;
        $app->post('/prod/upload/', function (Application $app) use (&$sessionId) {
            $sessionId = $app['session']->getId();
+            return "";
        });

        $client = new Client($app);
--- a/tests/Alchemy/Tests/Phrasea/Core/Configuration/Fixtures/configuration-setup.yml
+++ b/tests/Alchemy/Tests/Phrasea/Core/Configuration/Fixtures/configuration-setup.yml
@@ -6,6 +6,7 @@ main:
    maintenance: false
    key: ''
    api_require_ssl: true
+    delete-account-require-email-confirmation: true
    database:
        host: 'sql-host'
        port: 3306
@@ -212,3 +213,35 @@ embed_bundle:
    document:
        player: flexpaper
        enable-pdfjs: true
+geocoding-providers:
+    -
+        name: 'mapBox'
+        enabled: true
+        public-key: ''
+        default-position:
+            - 2.335062
+            - 48.879162
+        default-zoom: 2
+        marker-default-zoom: 11
+        position-fields:
+            -
+                name: GpsCompositePosition
+                type: latlng
+            # -
+            #    name: Longitude
+            #    type: lng
+            # -
+            #    name: Latitude
+            #    type: lat
+video-editor:
+    vttFieldName: VideoTextTrackChapters
+    seekBackwardStep: 1000 # in ms
+    seekForwardStep: 1000  # in ms
+    playbackRates:
+        - 1
+        - '1.5'
+        - 3
+
+user_account:
+    deleting_policies:
+        email_confirmation: true
--- a/tests/Alchemy/Tests/Phrasea/Core/Configuration/Fixtures/configuration.yml
+++ b/tests/Alchemy/Tests/Phrasea/Core/Configuration/Fixtures/configuration.yml
@@ -6,6 +6,7 @@ main:
    maintenance: false
    key: ''
    api_require_ssl: true
+    delete-account-require-email-confirmation: true
    database:
        host: 'sql-host'
        port: 3306
@@ -212,3 +213,35 @@ embed_bundle:
    document:
        player: flexpaper
        enable-pdfjs: true
+geocoding-providers:
+    -
+        name: 'mapBox'
+        enabled: true
+        public-key: ''
+        default-position:
+            - 2.335062
+            - 48.879162
+        default-zoom: 2
+        marker-default-zoom: 11
+        position-fields:
+            -
+                name: GpsCompositePosition
+                type: latlng
+            # -
+            #    name: Longitude
+            #    type: lng
+            # -
+            #    name: Latitude
+            #    type: lat
+video-editor:
+    vttFieldName: VideoTextTrackChapters
+    seekBackwardStep: 1000 # in ms
+    seekForwardStep: 1000  # in ms
+    playbackRates:
+        - 1
+        - '1.5'
+        - 3
+
+user_account:
+    deleting_policies:
+        email_confirmation: true
--- a/tests/bootstrap.sh
+++ b/tests/bootstrap.sh
@@ -34,7 +34,7 @@ then
    mv config/configuration.yml{,.backup}
    rm -f config/configuration-compiled.php
 fi
-./bin/setup system:install --email=test@phraseanet.com --password=test --db-user=root --db-template=en --db-password=toor --databox=db_test --appbox=ab_test --server-name=http://127.0.0.1 -y $VERBOSITY
+./bin/setup system:install --email=test@phraseanet.com --password=test --db-user=root --db-template=en-simple --db-password=toor --databox=db_test --appbox=ab_test --server-name=http://127.0.0.1 -y $VERBOSITY
 case "$INSTALL_MODE" in
    update)
        ./bin/developer ini:reset --email=test@phraseanet.com --password=test --run-patches --no-setup-dbs $VERBOSITY
@@ -44,5 +44,6 @@ case "$INSTALL_MODE" in
        ;;
 esac
 ./bin/developer ini:setup-tests-dbs $VERBOSITY
-./bin/console searchengine:index:create $VERBOSITY
+./bin/console searchengine:index -ndcp --force $VERBOSITY
 ./bin/developer phraseanet:regenerate-sqlite $VERBOSITY
+./bin/developer phraseanet:generate-js-fixtures $VERBOSITY
--- a/tests/files/cestlafete.jpg
+++ b/tests/files/cestlafete.jpg
--- a/yarn.lock
+++ b/yarn.lock