Merge branch 'franceconnect_local' into develop

# Conflicts:
#	app/assets/javascripts/application.js

app/assets/javascripts/application.js

@@ -26,6 +26,7 @@
 //= require leaflet.freedraw
 //= require smart_listing
 //= require turf
+//= require franceconnect
 
 $(document).ready(function() {
     $('.js-scrollTo').on('click', function() { // Au clic sur un élément

app/assets/javascripts/franceconnect_kit.js

@@ -2,6 +2,6 @@ $(document).on('page:load', franceconnect_kit);
 $(document).ready(franceconnect_kit);
 
 function franceconnect_kit() {
-    
+    franceConnectKit.init()
 }
 

app/assets/stylesheets/application.scss

@@ -17,6 +17,7 @@
  *= require bootstrap-datepicker3
  *= require leaflet
  *= require font-awesome
+ *= require franceconnect
  */
 @import "bootstrap-sprockets";
 @import "bootstrap";

app/views/layouts/application.html.haml

@@ -4,7 +4,6 @@
     %meta{:content => "text/html; charset=UTF-8", "http-equiv" => "Content-Type"}/
     %title TPS - Téléprocédures simplifiées
     %meta{'http-equiv' => "X-UA-Compatible", :content => "IE=edge"}
-    %script{src: 'http://fcp.integ01.dev-franceconnect.fr/js/franceconnect.js'}
 
     = stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true
     = javascript_include_tag 'application', 'data-turbolinks-track' => true