les commit de vendredi 07/03/2014
third commit
commit lundi 10/03/§2014
commit
commit nadia
Merge branch 'master' of https://github.com/bouchama/IlemERPMobile

Conflicts:
	Resources/controllers/accueilWin.js
	Resources/ui/windows/androidui/choixWin.js