IDE changes only
Merge branch 'master' of https://github.com/AIFDR/inasafe
cherry pick from 41fd52293f22236070a47c0aad37ca53452be63b and resolved conflict.
Resolved conflict
some pylint and pep8