Code formatting cleanups only.
Coding cleanups only
Fixed type in layer_name variable in aggregator.py
Code formatting cleanups in common testing.py
Added a little more logic for border width styling checks and fixed a bug where border_colour property was trying to be used to set border width.
typo fix

Signed-off-by: Werner Macho <werner.macho@gmail.com>
change default template to user 4-column legend
Fix #736 Python Error when assigning data type using Key Editor. Also ensure qgis is imported for all tools tests
Better import order for batch dialog imports
Resolved merge conflitcs after reverting ff9ddace6abf48304a2dd4b7497b189a95bbc246 which causes tests to stall.
 Green dote for plugin.py. Fixed badly named method in test_html_renderer. sip2 compliance update for batch dialog qesttings accessor.
Use new style signal slot connector in osm downloader
Use new style signal slot connector in minimum needs tool
Use sip2 style accessors for settings
Added missing QApplication import
resolve mergeconflicts
just to be sure commit resource again
Merged master to 683 branch
Regenerated resources etc.
Code review of impact merge dialog.