diff --git a/app/controllers/PaperGuide.scala b/app/controllers/PaperGuide.scala
new file mode 100644
index 000000000..88e66c153
--- /dev/null
+++ b/app/controllers/PaperGuide.scala
@@ -0,0 +1,121 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Association du Paris Java User Group.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package controllers
+
+import java.io.{PrintWriter, File}
+
+import models.{Speaker, Slot, ConferenceDescriptor, ScheduleConfiguration}
+import org.apache.commons.lang3.StringEscapeUtils
+import play.api.i18n.Messages
+
+/**
+  * Simple controller used to export the whole program as a CSV file.
+  * Practical if you want to print the schedule.
+  *
+  * @author created by N.Martignole, Innoteria, on 11/04/16.
+  */
+object PaperGuide extends SecureCFPController {
+
+  def exportProgram() = SecuredAction(IsMemberOf("cfp")) {
+    implicit request: SecuredRequest[play.api.mvc.AnyContent] =>
+      implicit val context = scala.concurrent.ExecutionContext.Implicits.global
+
+
+      val allScheduledConf: List[ScheduleConfiguration] = for (confType <- ConferenceDescriptor.ConferenceProposalTypes.ALL;
+                                                               scheduleId <- ScheduleConfiguration.getPublishedSchedule(confType.id);
+                                                               scheduledConf <- ScheduleConfiguration.loadScheduledConfiguration(scheduleId)
+      ) yield scheduledConf
+
+      val file = new File("./target", "DEVOXX_UTF8_" + allScheduledConf.hashCode() + ".csv")
+      val writer = new PrintWriter(file, "MacRoman") // !!! ENCODING !!!
+//      val writer = new PrintWriter(file, "UTF-8")
+      writer.println("id,name,day,from,to,roomName,proposalId,proposalTitle,proposalLang,track,firstSpeaker,secondarySpeaker,thirdSpeaker,fourthSpeaker,fifthSpeaker")
+
+      allScheduledConf.foreach {
+        scheduleConf: ScheduleConfiguration =>
+          scheduleConf.slots.foreach {
+            slot: Slot =>
+              writer.print(slot.id)
+              writer.print(",")
+              writer.print(slot.name)
+              writer.print(",")
+              writer.print(slot.day)
+              writer.print(",")
+              writer.print(slot.from.toString("HH:mm"))
+              writer.print(",")
+              writer.print(slot.to.toString("HH:mm"))
+              writer.print(",")
+              writer.print(slot.room.name)
+              writer.print(",")
+              slot.proposal.map {
+                proposal =>
+                  writer.print(proposal.id)
+                  writer.print(",")
+                  writer.print(StringEscapeUtils.escapeCsv(proposal.title))
+                  writer.print(",")
+                  writer.print(proposal.lang)
+                  writer.print(",")
+                  writer.print(StringEscapeUtils.escapeCsv(Messages(proposal.track.label)))
+                  writer.print(",")
+
+                  Speaker.findByUUID(proposal.mainSpeaker).map {
+                    speaker: Speaker =>
+                      writer.print(StringEscapeUtils.escapeCsv(speaker.cleanName))
+                      writer.print(",")
+                  }.getOrElse(writer.print(",,"))
+
+                  proposal.secondarySpeaker.map {
+                    secSpeaker =>
+                      Speaker.findByUUID(secSpeaker).map {
+                        s: Speaker =>
+                          writer.print(StringEscapeUtils.escapeCsv(s.cleanName))
+                          writer.print(",")
+                      }.getOrElse(writer.print(",,"))
+                  }.getOrElse(writer.print(",,"))
+
+                  val otherSpeakersNames = proposal.otherSpeakers.map{
+                    id:String=>
+                      Speaker.findByUUID(id).map{s=>
+                       StringEscapeUtils.escapeCsv(s.cleanName) + ","
+                      }.getOrElse(",,")
+                  }
+
+                  val paddedToSixSpeakers = otherSpeakersNames.padTo(6,",")
+
+                  paddedToSixSpeakers.foreach{token=>writer.print(token)}
+
+              }.getOrElse {
+                writer.print(",,,,,,,,")
+              }
+              writer.println("")
+
+          }
+      }
+      writer.close()
+
+      Ok("Done - Check target CFP folder")
+
+  }
+
+}
diff --git a/app/controllers/Publisher.scala b/app/controllers/Publisher.scala
index 5bec82a98..4339bde25 100644
--- a/app/controllers/Publisher.scala
+++ b/app/controllers/Publisher.scala
@@ -25,7 +25,7 @@ package controllers
 
 import akka.util.Crypt
 import library.search.ElasticSearch
-import library.{LogURL, SendQuestionToSpeaker, ZapActor}
+import library.{LogURL, ZapActor}
 import models._
 import play.api.cache.Cache
 import play.api.data.Form
@@ -36,14 +36,14 @@ import play.api.mvc._
 
 
 /**
- * Publisher is the controller responsible for the Web content of your conference Program.
- * Created by nicolas on 12/02/2014.
- */
+  * Publisher is the controller responsible for the Web content of your conference Program.
+  * Created by nicolas on 12/02/2014.
+  */
 object Publisher extends Controller {
   def homePublisher = Action {
     implicit request =>
       val result = views.html.Publisher.homePublisher()
-      val etag = Crypt.md5(result.toString()+"dvx").toString
+      val etag = Crypt.md5(result.toString() + "dvx").toString
       val maybeETag = request.headers.get(IF_NONE_MATCH)
 
       maybeETag match {
@@ -54,16 +54,23 @@ object Publisher extends Controller {
 
   def showAllSpeakers = Action {
     implicit request =>
-      import play.api.Play.current
-      val speakers = Cache.getOrElse[List[Speaker]]("allSpeakersWithAcceptedTerms", 600) {
-        Speaker.allSpeakersWithAcceptedTerms()
-      }
-      val etag = speakers.hashCode().toString + "_2"
-      val maybeETag = request.headers.get(IF_NONE_MATCH)
-      maybeETag match {
-        case Some(oldEtag) if oldEtag == etag => NotModified
-        case other => Ok(views.html.Publisher.showAllSpeakers(speakers)).withHeaders(ETAG -> etag)
+
+      // First load published slots
+      val publishedConf = ScheduleConfiguration.loadAllPublishedSlots().filter(_.proposal.isDefined)
+      val allSpeakersIDs = publishedConf.flatMap(_.proposal.get.allSpeakerUUIDs).toSet
+      val etag = allSpeakersIDs.hashCode.toString
+
+      request.headers.get(IF_NONE_MATCH) match {
+        case Some(tag) if tag == etag =>
+          NotModified
+
+        case other =>
+          val onlySpeakersThatAcceptedTerms: Set[String] = allSpeakersIDs.filterNot(uuid => Speaker.needsToAccept(uuid))
+          val speakers = Speaker.loadSpeakersFromSpeakerIDs(onlySpeakersThatAcceptedTerms)
+          Ok(views.html.Publisher.showAllSpeakers(speakers)).withHeaders(ETAG -> etag)
+
       }
+
   }
 
   def showSpeakerByName(name: String) = Action {
@@ -126,40 +133,40 @@ object Publisher extends Controller {
         maybeScheduledConfiguration match {
           case Some(slotConfig) if day == null => {
             val updatedConf = slotConfig.copy(slots = slotConfig.slots)
-            Ok(views.html.Publisher.showAgendaByConfType(updatedConf, confType, "wednesday"))
+            Ok(views.html.Publisher.showAgendaByConfType(updatedConf.slots, confType, "wednesday"))
           }
           case Some(slotConfig) if day == "monday" => {
             val updatedConf = slotConfig.copy(slots = slotConfig.slots.filter(_.day == "monday")
               , timeSlots = slotConfig.timeSlots.filter(_.start.getDayOfWeek == 1))
-            Ok(views.html.Publisher.showAgendaByConfType(updatedConf, confType, "monday"))
+            Ok(views.html.Publisher.showAgendaByConfType(updatedConf.slots, confType, "monday"))
           }
           case Some(slotConfig) if day == "tuesday" => {
             val updatedConf = slotConfig.copy(
               slots = slotConfig.slots.filter(_.day == "tuesday")
               , timeSlots = slotConfig.timeSlots.filter(_.start.getDayOfWeek == 2)
             )
-            Ok(views.html.Publisher.showAgendaByConfType(updatedConf, confType, "tuesday"))
+            Ok(views.html.Publisher.showAgendaByConfType(updatedConf.slots, confType, "tuesday"))
           }
           case Some(slotConfig) if day == "wednesday" => {
             val updatedConf = slotConfig.copy(
               slots = slotConfig.slots.filter(_.day == "wednesday")
               , timeSlots = slotConfig.timeSlots.filter(_.start.getDayOfWeek == 3)
             )
-            Ok(views.html.Publisher.showAgendaByConfType(updatedConf, confType, "wednesday"))
+            Ok(views.html.Publisher.showAgendaByConfType(updatedConf.slots, confType, "wednesday"))
           }
           case Some(slotConfig) if day == "thursday" => {
             val updatedConf = slotConfig.copy(
               slots = slotConfig.slots.filter(_.day == "thursday")
               , timeSlots = slotConfig.timeSlots.filter(_.start.getDayOfWeek == 4)
             )
-            Ok(views.html.Publisher.showAgendaByConfType(updatedConf, confType, "thursday"))
+            Ok(views.html.Publisher.showAgendaByConfType(updatedConf.slots, confType, "thursday"))
           }
           case Some(slotConfig) if day == "friday" => {
             val updatedConf = slotConfig.copy(
               slots = slotConfig.slots.filter(_.day == "friday")
               , timeSlots = slotConfig.timeSlots.filter(_.start.getDayOfWeek == 5)
             )
-            Ok(views.html.Publisher.showAgendaByConfType(updatedConf, confType, "friday"))
+            Ok(views.html.Publisher.showAgendaByConfType(updatedConf.slots, confType, "friday"))
           }
 
           case None => NotFound(views.html.Publisher.agendaNotYetPublished())
@@ -169,9 +176,8 @@ object Publisher extends Controller {
 
   def showByDay(day: String) = Action {
     implicit request =>
-
       def _showDay(slots: List[Slot], day: String) = {
-        val rooms = slots.groupBy(_.room).keys.toList.sortBy(_.id)
+        val rooms = slots.groupBy(_.room).keys.toList
         val allSlots = ScheduleConfiguration.getPublishedScheduleByDay(day)
         Ok(views.html.Publisher.showOneDay(allSlots, rooms, day))
       }
diff --git a/app/controllers/RestAPI.scala b/app/controllers/RestAPI.scala
index 837644a15..e261646c9 100644
--- a/app/controllers/RestAPI.scala
+++ b/app/controllers/RestAPI.scala
@@ -151,7 +151,8 @@ object RestAPI extends Controller {
                   ))
                 )
               )
-              Ok(jsonObject).as(JSON).withHeaders(ETAG -> etag, "Links" -> ("<" + routes.RestAPI.profile("conference").absoluteURL().toString + ">; rel=\"profile\""))
+              Ok(jsonObject).as(JSON).withHeaders(ETAG -> etag,
+                "Links" -> ("<" + routes.RestAPI.profile("conference").absoluteURL() + ">; rel=\"profile\""))
             }
           }
       }.getOrElse(NotFound("Conference not found"))
diff --git a/app/models/ConferenceDescriptor.scala b/app/models/ConferenceDescriptor.scala
index 6780fa5ac..e212d96a3 100644
--- a/app/models/ConferenceDescriptor.scala
+++ b/app/models/ConferenceDescriptor.scala
@@ -212,6 +212,8 @@ object ConferenceDescriptor {
 
     // Tip : I use the ID to sort-by on the view per day... So if the exhibition floor id is "aaa" it will be
     // the first column on the HTML Table
+
+    // Do not change the ID's once the program is published
     val HALL_EXPO = Room("a_hall", "Exhibition floor", 2300, "special", "")
     val HALL_A = Room("x_hall_a", "Open Data Camp", 100, "special", "")
 
@@ -459,23 +461,17 @@ object ConferenceDescriptor {
       val keynoteThursdaySlot2 = ConferenceRooms.keynoteRoom.map {
         r2 =>
           SlotBuilder(ConferenceProposalTypes.KEY.id, "thursday",
-            new DateTime("2016-04-21T09:40:00.000+02:00").toDateTime(DateTimeZone.forID("Europe/Paris")),
-            new DateTime("2016-04-21T10:00:00.000+02:00").toDateTime(DateTimeZone.forID("Europe/Paris")), r2)
+            new DateTime("2016-04-21T09:45:00.000+02:00").toDateTime(DateTimeZone.forID("Europe/Paris")),
+            new DateTime("2016-04-21T10:05:00.000+02:00").toDateTime(DateTimeZone.forID("Europe/Paris")), r2)
       }
       val keynoteThursdaySlot3 = ConferenceRooms.keynoteRoom.map {
         r3 =>
           SlotBuilder(ConferenceProposalTypes.KEY.id, "thursday",
-            new DateTime("2016-04-21T10:05:00.000+02:00").toDateTime(DateTimeZone.forID("Europe/Paris")),
-            new DateTime("2016-04-21T10:25:00.000+02:00").toDateTime(DateTimeZone.forID("Europe/Paris")), r3)
-      }
-      val keynoteThursdaySlot4 = ConferenceRooms.keynoteRoom.map {
-        r4 =>
-          SlotBuilder(ConferenceProposalTypes.KEY.id, "thursday",
-            new DateTime("2016-04-21T10:25:00.000+02:00").toDateTime(DateTimeZone.forID("Europe/Paris")),
-            new DateTime("2016-04-21T10:45:00.000+02:00").toDateTime(DateTimeZone.forID("Europe/Paris")), r4)
+            new DateTime("2016-04-21T10:10:00.000+02:00").toDateTime(DateTimeZone.forID("Europe/Paris")),
+            new DateTime("2016-04-21T10:30:00.000+02:00").toDateTime(DateTimeZone.forID("Europe/Paris")), r3)
       }
 
-      keynoteThursdayWelcome ++keynoteThursdaySlot1 ++ keynoteThursdaySlot2 ++ keynoteThursdaySlot3 ++ keynoteThursdaySlot4
+      keynoteThursdayWelcome ++keynoteThursdaySlot1 ++ keynoteThursdaySlot2 ++ keynoteThursdaySlot3
     }
 
     val keynoteSlotsFriday: List[Slot] = {
diff --git a/app/models/Slot.scala b/app/models/Slot.scala
index db42e4d1b..c2c74ab7f 100644
--- a/app/models/Slot.scala
+++ b/app/models/Slot.scala
@@ -25,8 +25,6 @@ package models
 
 import org.joda.time.DateTime
 import play.api.libs.json.Json
-import play.api.libs.json._
-import play.api.libs.functional.syntax._
 
 /**
  * Time slots and Room are defined as static file.
@@ -38,8 +36,6 @@ import play.api.libs.functional.syntax._
 
 case class Room(id: String, name: String, capacity: Int, setup: String, recorded:String) extends Ordered[Room] {
 
-  import scala.math.Ordered.orderingToOrdered
-
   def index: Int = {
     val regexp = "[\\D\\s]+(\\d+)".r
     id match {
@@ -48,7 +44,17 @@ case class Room(id: String, name: String, capacity: Int, setup: String, recorded
     }
   }
 
-  def compare(that: Room): Int = (this.id.substring(0, 3), this.index) compare(that.id.substring(0, 3), that.index)
+  def compare(that: Room): Int = {
+    // TODO a virer apres Devoxx FR 2016
+    // Hack for Devoxx France => I cannot change the Room IDs so I fix the order in an IndexedSeq here
+    if(Room.fixedOrderForRoom.indexOf(this.id) < Room.fixedOrderForRoom.indexOf(that.id)){
+      return -1
+    }
+if(Room.fixedOrderForRoom.indexOf(this.id) > Room.fixedOrderForRoom.indexOf(that.id)){
+      return 1
+    }
+    return 0
+  }
 }
 
 object Room {
@@ -62,6 +68,33 @@ object Room {
     ConferenceDescriptor.ConferenceRooms.allRooms.find(r => r.id == roomId).getOrElse(OTHER)
   }
 
+  // TODO à virer apres Devoxx FR 2016
+  val fixedOrderForRoom = IndexedSeq("a_hall",
+    "b_amphi",
+    "c_maillot",
+    "d_par241",
+    "f_neu251",
+    "e_neu252",
+    "par242AB",
+    "par242A",
+    "par242AT",
+    "par242B",
+    "par242BT",
+    "par243",
+    "neu253",
+    "neu253_t",
+    "par243_t",
+    "par201",
+    "par202_203",
+    "par204",
+    "par221M-222M",
+    "par224M-225M",
+    "neu_232_232",
+    "neu_234_235",
+    "neu_212_213",
+    "x_hall_a"
+  )
+
 }
 
 case class SlotBreak(id: String, nameEN: String, nameFR: String, room: Room)
diff --git a/app/views/CFPAdmin/allSpeakersWithAcceptedTalksAndBadge.scala.html b/app/views/CFPAdmin/allSpeakersWithAcceptedTalksAndBadge.scala.html
index 190784019..c18b196e8 100644
--- a/app/views/CFPAdmin/allSpeakersWithAcceptedTalksAndBadge.scala.html
+++ b/app/views/CFPAdmin/allSpeakersWithAcceptedTalksAndBadge.scala.html
@@ -1,4 +1,4 @@
-@(proposals: List[(Speaker, Iterable[Proposal])])(implicit lang: Lang, flash: Flash, req: RequestHeader)
+@(speakersAndProposals: List[(Speaker, Iterable[Proposal])])(implicit lang: Lang, flash: Flash, req: RequestHeader)
 
 @main("CFP Speakers") {
     <div class="row">
@@ -24,8 +24,9 @@ <h2><i class="icon-thumbs-up-alt"></i> CFP Admin</h2>
                 <div class="panel-heading">
                     <h3>All speakers with a badge</h3>
                     <em>Primary or secondary speaker, with a speaker badge</em>
+                    <em>CFP or Red Coat not included</em>
                     <em>No Quickies or B.O.F</em>
-                    <span class="label label-info">@proposals.size speakers</span>
+                    <span class="label label-info">@speakersAndProposals.size speakers</span>
                 </div>
                 <div class="panel-footer">
                      <a href="@routes.CFPAdmin.allSpeakers()" class="btn btn-sm btn-primary"><i class="icon-group"></i> @Messages("admin.btn.speakers")</a>
@@ -33,8 +34,8 @@ <h3>All speakers with a badge</h3>
             </div>
         </div>
 <pre>
-        @proposals.sortBy(_._1.name.map(_.capitalize)).map{case(speaker,props)=>
-@speaker.name.get.head.toString;@speaker.name.map(_.toUpperCase);@speaker.firstName.get;@speaker.email;@speaker.company.getOrElse("");@speaker.twitter.getOrElse("") }
+        @speakersAndProposals.sortBy(_._1.name.map(_.capitalize)).map{case(speaker,props)=>
+"@speaker.name.get.head.toString","@speaker.name.map(_.toUpperCase)","@speaker.firstName.get","@speaker.email.trim","@speaker.company.getOrElse("")","@speaker.cleanTwitter.map(_.drop(1))" }
 </pre>
 
     </div>
diff --git a/app/views/Publisher/showAgendaByConfType.scala.html b/app/views/Publisher/showAgendaByConfType.scala.html
index ceeba8a6d..f3123d858 100644
--- a/app/views/Publisher/showAgendaByConfType.scala.html
+++ b/app/views/Publisher/showAgendaByConfType.scala.html
@@ -1,7 +1,7 @@
-@(schedule: ScheduleConfiguration, talkType: String, day: String)(implicit lang: Lang, flash: Flash, req: RequestHeader)
-@import org.joda.time.DateTimeZone
+@(slots: List[Slot], talkType: String, day: String)(implicit lang: Lang, flash: Flash, req: RequestHeader)
+    @import org.joda.time.DateTimeZone
 
-    @views.html.Publisher.devoxxFR2016(Messages("agenda-" + talkType),Some(s"Agenda for Devoxx FR 2016 for $day"+Messages("day-" + day))) {
+    @views.html.Publisher.devoxxFR2016(Messages("agenda-" + talkType), Some(s"Agenda for Devoxx FR 2016 for $day" + Messages("day-" + day))) {
         <div class="large-12 columns">
             <h3>@Messages(talkType), @Messages("day-" + day)</h3>
             <p class="breadcrumb"><a href="@routes.Publisher.homePublisher()">@Messages("sw.home")</a>  &gt;
@@ -12,65 +12,49 @@ <h3>@Messages(talkType), @Messages("day-" + day)</h3>
         <div class="large-12 columns woocommerce">
             <table class="agendaTable">
                 <tr>
-                    <th><i class="icon-time"></i> Salle</th>
-                    @schedule.slots.groupBy(_.room).keys.toList.sorted.map { room: Room =>
+                    <th><i class="icon-time"></i> @Messages("publisher.room")</th>
+                    @slots.groupBy(_.room).keys.toList.sorted.map { room: Room =>
                         <td>@room.name</td>
                     }
                 </tr>
 
-                @if(day.toLowerCase=="thursday" && talkType.toLowerCase=="conf" ){
+                @if(day.toLowerCase == "thursday" && talkType.toLowerCase == "conf") {
                     <tr>
                         <th>
                             09:00 - 11:00
                         </th>
                         <td class="keynotes" colspan="8">
                             Keynotes dès 9h précise<br>
-                            <em>Le programme détaillé sera publié ultérieurement. Accueil + Petit-déjeuner dès 7h30</em><br>
-
+                            <em>Accueil + Petit-déjeuner dès 7h30</em><br>
                         </td>
                     </tr>
                 }
-                @if(day.toLowerCase=="friday" && talkType.toLowerCase=="conf" ){
+                @if(day.toLowerCase == "friday" && talkType.toLowerCase == "conf") {
                     <tr>
                         <th>
                             09:30 - 11:00
                         </th>
                         <td class="keynotes" colspan="8">
                             Keynotes 9h30<br>
-                            Le programme détaillé sera publié ultérieurement.
                         </td>
                     </tr>
                 }
 
-                @schedule.slots.groupBy(_.from).toList.sortBy(_._1.toDate.getTime).map { case (time: org.joda.time.DateTime, slots) =>
+                @slots.groupBy(_.from.getMillis).toList.sortWith(_._1 < _._1).map { case (_, subSlots) =>
                 <tr>
                     <th class="timeSlot">
-                        @time.toDateTime(DateTimeZone.forID("Europe/Brussels")).toString("HH:mm") - @slots.head.to.toDateTime(DateTimeZone.forID("Europe/Brussels")).toString("HH:mm")
+                        @subSlots.head.from.toDateTime(DateTimeZone.forID("Europe/Brussels")).toString("HH:mm")
+                        - @subSlots.head.to.toDateTime(DateTimeZone.forID("Europe/Brussels")).toString("HH:mm")
                     </th>
-                    @slots.sortBy(_.room).zipWithIndex.map { case(slot,index) =>
-
-                        <td class="room">
-                            @slot.proposal.map { p: Proposal =>
-                                <span class="track"> @tags.publisher.renderIconForTrack(p.track) @Messages(p.track.label)</span>
-                                @tags.publisher.renderFavorite(p.id)
-                                <span class="title"><a href="@routes.Publisher.showDetailsForProposal(p.id, p.escapedTitle)">@p.title</a></span>
-                                <span class="speaker"> @p.allSpeakerUUIDs.map { speakerUUID =>
-                                    @tags.publisher.renderSpeaker(speakerUUID)
-                                }</span>
-
-
-                            }
-                        @if(slot.proposal.isEmpty && slot.break.isEmpty ){
-                            Pas encore programmé
-                        }
-                        </td>
+                    @subSlots.groupBy(_.room).keys.toList.sorted.map { room: Room =>
+                        @tags.publisher.tagRenderRow(subSlots, room, 17)
                     }
                 </tr>
                 }
                 <tr>
-                    <th><i class="icon-time"></i> Salle</th>
-                    @schedule.slots.groupBy(_.room).keys.toList.sorted.map { room: Room =>
-                        <td>@room.name</td>
+                    <th><i class="icon-time"></i> @Messages("publisher.room")</th>
+                    @slots.groupBy(_.room).keys.toList.sorted.map { roomName: Room =>
+                        <td>@roomName.name</td>
                     }
                 </tr>
             </table>
diff --git a/app/views/Publisher/showOneDay.scala.html b/app/views/Publisher/showOneDay.scala.html
index f987dc419..67b54eb4a 100644
--- a/app/views/Publisher/showOneDay.scala.html
+++ b/app/views/Publisher/showOneDay.scala.html
@@ -1,46 +1,40 @@
 @(slots: List[Slot], rooms: List[Room], day: String)(implicit lang: Lang, req: RequestHeader)
 @import org.joda.time.DateTimeZone
 
-@views.html.Publisher.devoxxFR2016(Messages(s"sw.show.$day")) {
-    <div class="large-12 columns">
-        <h1 class="entry-title">@Messages(s"day-$day")</h1>
-
-        <p class="breadcrumb"><a href="@routes.Publisher.homePublisher()">@Messages("sw.home")</a> &gt;
-            <a href="@routes.Publisher.showByDay("wed")">@Messages("sw.agenda.wed")</a> /
-            <a href="@routes.Publisher.showByDay("thu")">@Messages("sw.agenda.thu")</a> /
-            <a href="@routes.Publisher.showByDay("fri")">@Messages("sw.agenda.fri")</a>
-        </p>
-
-    </div>
-
-    <div class="columns large-12 woocommerce">
-        <table class="agendaTable">
-            <tr>
-                <th><i class="icon-time"></i> Room</th>
-                @rooms.sorted.map { roomName: Room =>
-                    <td>@roomName.name</td>
-                }
+
+    @views.html.Publisher.devoxxFR2016(Messages(s"sw.show.$day")) {
+        <div class="large-12 columns">
+            <h1 class="entry-title">@Messages(s"day-$day")</h1>
+
+            <p class="breadcrumb"><a href="@routes.Publisher.homePublisher()">@Messages("sw.home")</a> &gt;
+                <a href="@routes.Publisher.showByDay("wed")">@Messages("sw.agenda.wed")</a> /
+                <a href="@routes.Publisher.showByDay("thu")">@Messages("sw.agenda.thu")</a> /
+                <a href="@routes.Publisher.showByDay("fri")">@Messages("sw.agenda.fri")</a>
+            </p>
+
+        </div>
+
+        <div class="columns large-12 woocommerce">
+            <table class="agendaTable">
+                <tr>
+                    <th><i class="icon-time"></i> @Messages("publisher.room")</th>
+                    @slots.groupBy(_.room).keys.toList.sorted.map { roomName: Room =>
+                        <td>@roomName.name</td>
+                    }
                 </tr>
 
-            @slots.groupBy(s=> s.from.getMillis).toList.sortWith(_._1 < _._1).map { case (_, subSlots) =>
-                    <tr >
-                        <th class="timeSlot">
-                            @subSlots.head.from.toDateTime(DateTimeZone.forID("Europe/Brussels")).toString("HH:mm") - @subSlots.head.to.toDateTime(DateTimeZone.forID("Europe/Brussels")).toString("HH:mm")
-                        </th>
-                        @rooms.map { room =>
-                            @tags.publisher.tagRenderRow(subSlots,room,rooms.size)
-                        }
-                    </tr>
-            }
-
-            <tr>
-                <th><i class="icon-time"></i> Room</th>
-                @slots.groupBy(_.room).keys.toList.sorted.map { roomName: Room =>
-                    <td>@roomName.name</td>
+                @slots.groupBy(s => s.from.getMillis).toList.sortWith(_._1 < _._1).map { case (_, subSlots) =>
+                    @tags.publisher.renderOneDay(subSlots,slots,rooms)
                 }
-            </tr>
-        </table>
+
+                <tr>
+                    <th><i class="icon-time"></i> @Messages("publisher.room")</th>
+                    @slots.groupBy(_.room).keys.toList.sorted.map { roomName: Room =>
+                        <td>@roomName.name</td>
+                    }
+                </tr>
+            </table>
 
 
-    </div>
-}
\ No newline at end of file
+        </div>
+    }
\ No newline at end of file
diff --git a/app/views/tags/publisher/renderFavorite.scala.html b/app/views/tags/publisher/renderFavorite.scala.html
index 440885ddf..02d9122f0 100644
--- a/app/views/tags/publisher/renderFavorite.scala.html
+++ b/app/views/tags/publisher/renderFavorite.scala.html
@@ -3,7 +3,6 @@
 @defining(UserCFPController.findAuthenticator) { maybeUuid:Option[String] =>
     @maybeUuid.map { uuid:String =>
         @if(FavoriteTalk.isFavByThisUser(proposalId = proposalId, webuserId = uuid)) {
-
             <input id="checkbox_@proposalId" type="checkbox" class="cfp-fav" value="@proposalId" checked>
             <label class="cfp-lab" for="checkbox_@proposalId"></label>
         } else {
diff --git a/app/views/tags/publisher/renderOneDay.scala.html b/app/views/tags/publisher/renderOneDay.scala.html
new file mode 100644
index 000000000..4768693a1
--- /dev/null
+++ b/app/views/tags/publisher/renderOneDay.scala.html
@@ -0,0 +1,12 @@
+@(subSlots:List[Slot], slots:List[Slot], rooms:List[Room])(implicit req:RequestHeader)
+@import org.joda.time.DateTimeZone
+
+<tr>
+<th class="timeSlot">
+    @subSlots.head.from.toDateTime(DateTimeZone.forID("Europe/Brussels")).toString("HH:mm")
+    - @subSlots.head.to.toDateTime(DateTimeZone.forID("Europe/Brussels")).toString("HH:mm")
+</th>
+@slots.groupBy(_.room).keys.toList.sorted.map { room: Room =>
+    @tags.publisher.tagRenderRow(subSlots, room, rooms.size)
+}
+</tr>
\ No newline at end of file
diff --git a/app/views/tags/publisher/tagRenderRow.scala.html b/app/views/tags/publisher/tagRenderRow.scala.html
index 7969cef9e..895ec2149 100644
--- a/app/views/tags/publisher/tagRenderRow.scala.html
+++ b/app/views/tags/publisher/tagRenderRow.scala.html
@@ -1,24 +1,39 @@
-@(subSlots: List[Slot], room: Room, roomSize: Int)(implicit req:RequestHeader)
+@(subSlots: List[Slot], room: Room, roomSize: Int)(implicit req: RequestHeader)
 
     @subSlots.filter(_.room.id == room.id).map { zeSlot: Slot =>
         @zeSlot.proposal.map { p: Proposal =>
-            <td class="room @room.id @zeSlot.id">
-                <span class="talkType">@Messages(p.talkType.id)</span>
-                <span class="track"> @tags.publisher.renderIconForTrack(p.track) @Messages(p.track.label) @tags.publisher.renderFavorite(p.id)</span>
-                <span class="title"><a href="@routes.Publisher.showDetailsForProposal(p.id, p.escapedTitle)">@p.title</a></span>
-                <span class="speaker"> @p.allSpeakerUUIDs.map { speakerUUID =>
-                    @tags.publisher.renderSpeaker(speakerUUID)
-                }</span>
-            </td>
+
+            @if(p.talkType == ConferenceDescriptor.ConferenceProposalTypes.KEY) {
+                <td class="room @room.id @zeSlot.id" colspan="@roomSize">
+                    <span class="talkType">@Messages(p.talkType.id) (retransmission en salle Maillot, Neuilly 252-AB et Paris 242-AB)</span>
+                    <h4><a href="@routes.Publisher.showDetailsForProposal(p.id, p.escapedTitle)">@p.title</a></h4>
+                    <span class="speaker"> @p.allSpeakerUUIDs.map { speakerUUID =>
+                        @tags.publisher.renderSpeaker(speakerUUID,true)
+                    }</span>
+                    @tags.publisher.renderFavorite(p.id)
+                </td>
+            } else {
+                <td class="room @room.id @zeSlot.id">
+                    <span class="talkType">@Messages(p.talkType.id)</span>
+                    <span class="track"> @tags.publisher.renderIconForTrack(p.track)</span>
+                    <span class="title"><a href="@routes.Publisher.showDetailsForProposal(p.id, p.escapedTitle)">@p.title</a></span>
+                    <span class="speaker"> @p.allSpeakerUUIDs.map { speakerUUID =>
+                        @tags.publisher.renderSpeaker(speakerUUID)
+                    }</span>
+                    @tags.publisher.renderFavorite(p.id)
+                </td>
+            }
+
+
         }
         @if(zeSlot.break.isDefined) {
             <td class="break @room.id" colspan="@roomSize">
-             @Messages("tagRenderRow-"+zeSlot.break.get.id)
+            @Messages("tagRenderRow-" + zeSlot.break.get.id)
             </td>
         }
-          @if(zeSlot.notAllocated) {
-                <td class="notAllocated @zeSlot.id">TBA</td>
-            }
+        @if(zeSlot.notAllocated) {
+            <td class="notAllocated @zeSlot.id">TBA</td>
+        }
 
     }
     @if(!subSlots.exists(_.room.id == room.id)) {
diff --git a/conf/messages b/conf/messages
index 50a051511..0d17bd72e 100644
--- a/conf/messages
+++ b/conf/messages
@@ -809,3 +809,4 @@ cfpadmin.toreview={0} proposal(s) to review
 cfpAdmin.showWhenCreated=Submitted to the CFP on {0}
 
 publisher.showMore=See proposal details
+publisher.room=Room
\ No newline at end of file
diff --git a/conf/messages.fr b/conf/messages.fr
index 768576041..e9060a8cb 100644
--- a/conf/messages.fr
+++ b/conf/messages.fr
@@ -762,4 +762,5 @@ noPasswordHere=Le site du CFP ne vous permet pas de configurer un mot de passe,
 cfpadmin.toreview={0} sujet(s) à noter
 cfpAdmin.showWhenCreated=Sujet soumis par le speaker sur le CFP le {0}
 
-publisher.showMore=Voir la description
\ No newline at end of file
+publisher.showMore=Voir la description
+publisher.room=Salle
\ No newline at end of file
diff --git a/conf/routes b/conf/routes
index 6e355d516..2b4ece411 100644
--- a/conf/routes
+++ b/conf/routes
@@ -159,6 +159,9 @@ GET           /ar/doMassRefuseAndRedirect
 # For Fun, it works only if you have Elastic Search
 GET           /cloudtags                                                        controllers.CallForPaper.cloudTags()
 
+# For Paper guide
+GET           /guide/exported                                                   controllers.PaperGuide.exportProgram()
+
 # Content Publisher
 # If you plan to use the CFP for your program, you can adapt the URLs below
 # Please, do not try to propose a configurable system here, as each Conference has its own URLs
diff --git a/public/dvfr2015/dvfr2015.css b/public/dvfr2015/dvfr2015.css
index eccedea52..13d269d17 100644
--- a/public/dvfr2015/dvfr2015.css
+++ b/public/dvfr2015/dvfr2015.css
@@ -20003,7 +20003,7 @@ Main Top Section - Image Page
     -ms-transform: skew(-20deg, 0);
     transform: skew(-20deg, 0);
     position: absolute;
-    width: 64%;
+    width: 75%;
     height: 100%;
     left: 210px;
     z-index: 1;