bootstrap connexion
bootstrap connexion
Merge branch 'master' of https://github.com/loicfaure/IVVQ_MyTennis

Conflicts:
	MyTennis.iml
Merge branch 'master' of https://github.com/loicfaure/IVVQ_MyTennis
Merge branch 'master' of https://github.com/loicfaure/IVVQ_MyTennis

Conflicts:
	MyTennis.iml
Merge branch 'master' of https://github.com/loicfaure/IVVQ_MyTennis
Merge branch 'master' of https://github.com/loicfaure/IVVQ_MyTennis

Conflicts:
	MyTennis.iml
Merge remote-tracking branch 'origin/master'

Conflicts:
	grails-app/views/layouts/main.gsp