moved from sqlite to  mysql
Add Cabinet View
Ajout des ressources html, css, images, js
Ajout des shared
pages ajoutées
get the pages content from db
editions with ckeditor works
editions with ckeditor bug resolved edition of cabinet/actu/expertise  definitely works
Merge branch 'WYSIWYG'

* WYSIWYG:
  editions with ckeditor bug resolved edition of cabinet/actu/expertise  definitely works
  editions with ckeditor works
  get the pages content from db
  pages ajoutées
  Add Cabinet View
  moved from sqlite to  mysql

Conflicts:
	app/views/layouts/_header.html.erb
	app/views/layouts/application.html.erb
Marging and updating gitignore to not push database.yml to the public repo in order to keep one's db config
Add config/database.yml to gitignore
Ajout d'éléments 1
pages done without css
pages done without css
Added some css, it has to be reviewed
moved your jquery.js because of conflicts between my version used for the template and yours used for coeditor.
added lamrani folder containing the html and documentation using app/assets resources
Merge branch 'master' of gitlab.usec-utc.fr:n.bouabdallah/etude-lamrani

# By Nabil BOUABDALLAH
# Via Nabil BOUABDALLAH
* 'master' of gitlab.usec-utc.fr:n.bouabdallah/etude-lamrani:
  Added some css, it has to be reviewed
  pages done without css
  editions with ckeditor bug resolved edition of cabinet/actu/expertise  definitely works
  editions with ckeditor works
  get the pages content from db
  pages ajoutées
  Add Cabinet View
  moved from sqlite to  mysql

Conflicts:
	app/views/layouts/application.html.erb
mod .gitignore
prise en compte du css mais elements mal placés dans la page
Merge branch 'master' of gitlab.usec-utc.fr:n.bouabdallah/etude-lamrani