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
#683 Aggregation Template - first draft of basic dialog for merging impact summary from two layers.
#683 Aggregation Template - first draft of basic test for impact function dialog.
#683 Aggregation Template - minor updates - added first test dataset.
#683 Aggregation Template - initial implementation for agg parsers
Added missing resources for impact combiner
Disable remote debugging in impact merge dialog
Created dictionary for merged report
Added html renderer and convert to png
Tidy up code and commented html_renderer:104 so it won't save the image twice
Set image path to selected directory.
Print rows containing 'total' first. Not really an elegant solution.
Add exception handling. There should be a common exception for blank directory chosen since some other tools doesn't handle this.
Refactored code, Add user feedback if all reports generated successfully.
Merge remote-tracking branch 'origin/inasafe-683' into inasafe-683