ok
ok
Merge branch 'master' of https://github.com/DaRkD0G/ProjetAifcc.git

Conflicts:
	AppAIFCC/assets/css/style_page_formation.css
	AppAIFCC/assets/pageformations/les_formations.html
	AppAIFCC/src/com/pack/vue/FormationFragment.java