Delimited text GUI tidy up.  Renamed useWatcher option to watchFile
Minor gui fix
Delimited text plugin moved to core
modified topology checker mostly GUI overhaul
Fix merge conflict
Fixing line spacing in <pre> section of delimited text context help
Return rgb from all colour functions
Add aplha to colour ramp
Return rgba from ramp_color
Merge pull request #593 from mach0/topocheck

modified topology checker mostly GUI overhaul
Merge pull request #591 from ccrook/delimited_text_to_core

Delimited text to core
Disallow changing of map layer registry directly
QgsMapLayerRegistry::mapLayers() returned reference is now const
Fix generation of empty layer/style entries
Use a cosmetic pen for snap lines to prevent lines scaling (fix #7524)
Merge branch 'master' of https://github.com/qgis/Quantum-GIS into styles_to_db