Merge branch 'master' of https://github.com/AIFDR/inasafe
Merge branch 'master' of https://github.com/AIFDR/inasafe
Merge branch 'master' of https://github.com/AIFDR/inasafe
Merge branch 'master' of https://github.com/AIFDR/inasafe
Merge branch 'master' of https://github.com/AIFDR/inasafe
Merge branch 'master' of https://github.com/AIFDR/inasafe
Merge branch 'master' of https://github.com/AIFDR/inasafe
Merge branch 'master' of https://github.com/essc/inasafe
Merge branch 'master' of https://github.com/AIFDR/inasafe
Merge branch 'master' of https://github.com/AIFDR/inasafe
Merge branch 'master' of https://github.com/AIFDR/inasafe
#730 - added test for keyword_io
Updated ID translation.
fix test
disable test for now
Disabled copy keywords test
#730 - fix for test for keyword_io
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	safe_qgis/utilities/test/test_keyword_io.py
Fix copy keywords test
Merge branch 'master' of https://github.com/AIFDR/inasafe