Merge branch 'develop' into staging

app/controllers/ping_controller.rb

@@ -0,0 +1,11 @@
+class PingController < ApplicationController
+
+  def index
+    if (ActiveRecord::Base.connected?)
+      render nothing: true, status: 200, content_type: "application/json"
+    else
+      render nothing: true, status: 500, content_type: "application/json"
+    end
+  end
+
+end

app/views/administrateurs/sessions/new.html.haml

@@ -1,4 +1,5 @@
 #form_login
+  %br
   = image_tag('logo-tps.png')
   %br
   %h2#login_admin Administration

app/views/gestionnaires/sessions/new.html.haml

@@ -1,4 +1,5 @@
 #form_login
+  %br
   = image_tag('logo-tps.png')
   %br
   %h2#gestionnaire_login Accompagnateur

config/routes.rb

@@ -1,5 +1,7 @@
 Rails.application.routes.draw do
 
+  get "/ping" => "ping#index", :constraints => {:ip => /127.0.0.1/}
+
   devise_for :administrations, skip: [:password, :registrations]
 
   devise_for :administrateurs, controllers: {