Support testing using QGIS > 2.0
Merge pull request #962 from akbargumbira/inasafe_824

Support testing using QGIS > 2.0
Merge branch 'develop' of github.com:AIFDR/inasafe into realtime_2.1