Merge pull request #14 from Benoitlecorre/integrate_devise

fix bug
slider + style d'une vue appartement
fix conflit gemlock
Merge pull request #15 from Benoitlecorre/slider

slider + style d'une vue appartement
merge fix