Update wfr_doc.tex
Merge branch 'master' of https://github.com/faitdivers/pyao into iss47

Conflicts:
	doc/WFR/wfr_doc.tex
Merge branch 'iss47' of https://github.com/faitdivers/pyao into iss47
Merge pull request #79 from faitdivers/iss47

Iss47
Merge branch 'master' of https://github.com/faitdivers/pyao into iss32

Conflicts:
	doc/WFR/wfr_doc.tex