Merge pull request #1122 from akbargumbira/develop

Delete and update some test control files and address Map Legend class c...
update ubuntu12.04 test png

Signed-off-by: Werner Macho <werner.macho@gmail.com>
Merge pull request #1129 from akbargumbira/develop

[Realtime] Adjust some configurations to suit the deployment.
[Realtime] Fix map canvas rendering issue in QGIS 2.4
Merge branch 'develop' of github.com:AIFDR/inasafe into develop