Fix for #8130 - WFS client: invalid columns after copy/paste.
Mapserver: fixed inconsistencies int WMS GetFeatureInfo response
Expose QgsMapToPixelSimplifier to Python
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/mapserver/qgswmsserver.cpp
Re-write the snapping settings when removing a layer
Make QgsComposerManager non-modal, ensure consistency of composer manager composer list
Simplify test
Don't open multiple composer manager windows, don't hide the composer manager when showing/duplicating a composer
Use deleteLater in QgisApp::deleteComposerManager
Add .orig to gitignore
Merge pull request #1324 from thodorisvakkas/master

[TRANSUP] greek translation 20140423
Remove identify mode and auto open from options from options from dialog
[processing] fix help method in GeoAlgorithm class
Add better default colour and width for measure tools. Fix #10029
Add node points for measure tool
[processing] store settings using QSettings instead of in a dedicated file
[TRANSUP] pt_BR from transifex test

Signed-off-by: Werner Macho <werner.macho@gmail.com>
Fix capitalisation of string
[TRANSUP] nb by James

Signed-off-by: Werner Macho <werner.macho@gmail.com>
allow to add a QToolBar to QGisInterface (will allow subclassing)