Fixing issue #224

Changing "density" into "Population count"
minor edit
minor edit

fixing table
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	docs/source/training/socialisation/run_basic_inasafe.rst
Resolve Merge Conflicts
Update screenshots and fix 401

Updating screenshots for id and en version to reflect changes for QGIS
2.6 and InaSAFE 2.2
fixing few typos causing errors in compile run and compressing images

Signed-off-by: Werner Macho <werner.macho@gmail.com>
Merge branch 'pr/238' into develop