Merge pull request #1120 from timlinux/master

Merged develop to master
[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 ...
Dont translate minimum needs item for now. Will be addressed on the new design
Merge pull request #1133 from akbargumbira/develop

Dont translate minimum needs item for now. Will be addressed on the new ...
[Realtime] Allow sftp configuration to use port.
Merge pull request #1134 from akbargumbira/develop

[Realtime] Allow sftp configuration to use port.
Wrap sftp configuration.
Fix wrong env variable
[Realtime] Add more descriptive docstring.
Merge pull request #1136 from akbargumbira/develop

[Realtime] Wrap sftp configurations to also read from env variables
[Realtime] Fix typo.
Merge pull request #1137 from akbargumbira/develop

[Realtime] Fix typo.
[Realtime] Fix wrong resource location.
Merge pull request #1138 from akbargumbira/develop

[Realtime] Fix wrong resource location.