Merge branch 'master' of git://github.com/Chill-project/Person

Conflicts:
	Resources/config/routing.yml

Resources/config/routing.yml

@@ -87,4 +87,13 @@ chill_person_export:
         menus:
             export:
                 order: 200
-                label: Export persons
+                label: Export persons
+
+chill_person_timeline:
+    pattern: /{_locale}/person/{person_id}/timeline
+    defaults: { _controller: ChillPersonBundle:TimelinePerson:person }
+    options:
+        menus:
+            person:
+                order: 60
+                label: Timeline

Resources/config/services.yml

@@ -18,3 +18,17 @@ services:
             - ['setContainer', ["@service_container"]]
         tags:
             - { name: chill.search, alias: 'person_regular' }
+            
+    chill.person.timeline.accompanying_period_opening:
+        class: Chill\PersonBundle\Timeline\TimelineAccompanyingPeriodOpening
+        arguments:
+            - "@doctrine.orm.entity_manager"
+        tags:
+            - { name: chill.timeline, context: 'person' }
+            
+    chill.person.timeline.accompanying_period_closing:
+        class: Chill\PersonBundle\Timeline\TimelineAccompanyingPeriodClosing
+        arguments:
+            - "@doctrine.orm.entity_manager"
+        tags:
+            - { name: chill.timeline, context: 'person' }