squelette index
modified js for debugging
recuperation1
recuperation2
Pull master and fix conflict
debug js
Ajout classe css pour article et dimensionnement des articles pour faire
des blocs de 9 dans application.js
Merge branch 'jsbranch' into frontend

Conflicts:
	app/views/index.scala.html
	public/javascripts/frontend/application.js
Merge branch 'master' of https://github.com/GeekStudentInside/NuitEMN into frontend
fix user
Merge branch 'frontend' of https://github.com/GeekStudentInside/NuitEMN into frontend

Conflicts:
	public/javascripts/frontend/application.js
Merge branch 'frontend' of https://github.com/GeekStudentInside/NuitEMN into frontend
Merge branch 'frontend' of https://github.com/GeekStudentInside/NuitEMN into frontend

Conflicts:
	public/javascripts/frontend/application.js
Merge branch 'frontend' of https://github.com/GeekStudentInside/NuitEMN into frontend
cleaning method in application.js
cleaning method in application.js
affichage du menu administrateur
massive update
Revert "massive update"

This reverts commit 08685eb542015d62de64a75ba905358f11a39c6a.
Merge branch 'frontend' of https://github.com/GeekStudentInside/NuitEMN into frontend