Merge pull request #198 from egonzale/manual_en_v2.0

Updates to module 7 lessons 1 and 2
Merge pull request #2 from qgis/manual_en_v2.0

Merge pull request #198 from egonzale/manual_en_v2.0