clear up the code
Merge branch 'master' into dev

Conflicts:
	OPAM_Client/res/layout/cours_detail_2.xml
	OPAM_Client/res/layout/main.xml
	OPAM_Client/res/layout/view_page.xml
	OPAM_Client/res/values/strings.xml
account del fonction added