Fix #1004 Bug - OpenLayers Plugin - Add OpenStreetMap Layer
Merge pull request #1005 from timlinux/inasafe-1004

Fix #1004 Bug - OpenLayers Plugin - Add OpenStreetMap Layer
Move all tests in safe.common to safe.common.test
Merge pull request #1006 from akbargumbira/develop

Move all tests in safe.common to safe.common.test
Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop