added eclipse project configuration.
new python config settings
Bumped release branch from alpha to final
#658 Release 1.2.0 - Fix failing test in jenkins build http://jenkins.linfiniti.com/job/InaSAFE-Release-Branch-QGIS1/92/
Merge branch 'version-1_2' of https://github.com/AIFDR/inasafe
added file
Merge branch 'master' of https://github.com/essc/inasafe

Conflicts:
	__init__.py
	metadata.txt
	safe_qgis/report/test/test_map.py
	safe_qgis/ui/resources_rc.py
	safe_qgis/widgets/dock.py
Merge branch 'master' of https://github.com/AIFDR/inasafe
Fixed categorical threshold
Added user configurable threshold
updated resource_rc
merged from origin
Merge branch 'master' of https://github.com/AIFDR/inasafe into fix_categorised_hazard_pop_function
updated resources_rc.py
Merged fix #726 set defaults for categorical impact function to 1/3, 2/3 and 1.