#683 Added tokenisation on disclaimer and organisation logo. Override the default they exist on inasafe global options.
added method to compare Qt version available with needed version
use version check for QWebView::selectedHtml
fixes #746
Merge branch 'master' of github.com:AIFDR/inasafe
Translation file updates
#683 User now can pick their own template for merged impact.
Merge branch 'master' of github.com:AIFDR/inasafe
#683 Added validation for all map components needed, so that user can get the feedbacks whats missing on their own template.
Fix wording in options dialog for template directory
Logo updates
Fix issue with printing maps for impacts without full_report
All safe_qgis.report tests passing on my workstation. Fix for issue with logo background coming out dark. Other small tidy ups
Fixes for template
Regenerated resources and uic
Fixed merge conflicts
Fix #757
attempt to implement smart column management in reports
Fix typos
Merge branch 'master' of github.com:AIFDR/inasafe into native_qgis_impact
Fix PEP8 issues