Coding standards.
Merge remote-tracking branch 'origin/develop' into develop
Merge remote-tracking branch 'origin/develop' into develop
Merge pull request #1119 from timlinux/develop

Test checksum fixes for test map
Fix render html to pdf and use lower dpi to fasten test.
Merge pull request #1121 from akbargumbira/develop

Fix render html to pdf and use lower dpi in test to fasten the test.
Delete and update some test control files and address Map Legend class coding standard.
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>
Fix #1114, failure in single test.
Merge remote-tracking branch 'origin/develop' into develop
Pep8.
Update unit test for code coverage 80% #337
[Realtime] Adjust some configurations to suit the deployment.
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
Merge pull request #1130 from akbargumbira/develop

[Realtime] Fix map canvas rendering issue in QGIS 2.4
[Realtime] Add id locale on making the report to ensure the translation is working properly on realtime.
Merge pull request #1131 from akbargumbira/develop

[Realtime] Add id locale on making the report to ensure the translation ...