Fixed bug in options dialog due to incorrect bracket order
Fix for invalid operand types in string concatenation in jenkins with aggregator.py
Test fix for html renderer
fix jenkins pep8 and part of pylint

Signed-off-by: Werner Macho <werner.macho@gmail.com>
Removed the use of QString and QStringList that cause the  test hangs.
Simplifiacation of code in aggregation tests
Merge branch 'master' of github.com:AIFDR/inasafe into aggregator_wrappers
Move initializing keywords of aggregation.layer to Aggregator.__init__ from Dock.prepare_aggregator
Add test for arrgregating in aoi mode