new edits
Merge branch 'master' of https://github.com/essc/PM_inasafe_training
new images