Recup + avancement Devis

Lundi 21/07/2014 14h24
Merge branch 'Developpement' of https://github.com/Projet-Nextwatt/B2E into Developpement

Conflicts:
	Nextwatt/application/third_party/dompdf/lib/fonts/log.htm
Merge branch 'Developpement' of https://github.com/Projet-Nextwatt/B2E into Developpement