Florian D: Menu Dot Bar + menu barre
Florian D : Menu Dot Bar + Menu barre
Merge branch 'master' of
ssh://git@github.com/jeromehubner/ProjetAIFCC2014.git

Conflicts:
	ProjetAIFCC2014/res/values/strings.xml
	ProjetAIFCC2014/src/projetaifcc2014/departement/Activity_department.java
	ProjetAIFCC2014/src/projetaifcc2014/drawer/Activity_drawer.java
	ProjetAIFCC2014/src/projetaifcc2014/expandable_list_formation/ExpandableListActivity.java