ok test
test
modif readme
Merge branch 'master' of https://github.com/Thibowdwi/digisquare

Conflicts:
	README.md
modif README.md
nouvell modif
clean
Merge branch 'master' of https://github.com/Thibowdwi/digisquare

Conflicts:
	README.md
clean total du readme

Signed-off-by: AliceGarden <joanny.saillet@y-nov.com>
test
Merge branch 'master' of https://github.com/Thibowdwi/digisquare

Conflicts:
	README.md
install sabre
install lib sabre
Add button Import event in Event View.
Add function import Event in EventsController.
New file for import function.
Modification of the Event form

Signed-off-by: AliceGarden <joanny.saillet@y-nov.com>
Modification of the name 'import' to 'upload'

Signed-off-by: AliceGarden <joanny.saillet@y-nov.com>
modification Upload form

Signed-off-by: AliceGarden <joanny.saillet@y-nov.com>
Mise en place d'un fichier contenant les correspondance ical/bdd

Signed-off-by: AliceGarden <joanny.saillet@y-nov.com>