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

Conflicts:
	doc/WFR/wfr_doc.tex
changes in the creation of the G matrix; changes in the test procedure for WFR
Merge branch 'master' into iss32
Merge branch 'master' of https://github.com/faitdivers/pyao into iss32
added a Zernike aberration to the test of WFR
Changed the main to accommodate the changes made in the WFR section; test file for WFR works with Zernike modes
Cleaned the WFR files of remnants from the debug procedures
Merge pull request #82 from faitdivers/iss32

Iss32 - implementing the Fried reconstruction geometry.

Test file containing Tip and Astigmatism testing.
Integration with the main loop.
Now WFR returns Phi and its position in the x and y direction.
Merge branch 'master' into WFRSouthwell

Conflicts:
	doc/WFR/wfr_doc.tex
	src/WFR/mainWFR.py
	src/WFR/testWFR.py
	src/main.py