Delimited text GUI tidy up.  Renamed useWatcher option to watchFile
Minor gui fix
Delimited text plugin moved to core
Fix merge conflict
Fixing line spacing in <pre> section of delimited text context help
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)
Fix wmsserver: Do not manipulate maplayerregistry directly
[Fix #7806] Be more verbose in "invalid layer" dialog
Small fixes
 * Fix minor memory leak in attribute dialog
 * Safety check in dual view
Add relation manager ui

Conflicts:
	src/app/qgsprojectproperties.cpp
	src/ui/qgsprojectpropertiesbase.ui
Add relation edit type
Remove unneeded method
Singleton
Add editor widgets wrapper
Whatever
New attribute editor API
Further widgetfactory stuff