Merge pull request #76 from emirhartato/master

minor edit
fixing minor build problems
minor edit

editing rst in training/intermediate/qgis-inasafe