Mapserver: fixed inconsistencies int WMS GetFeatureInfo response
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/mapserver/qgswmsserver.cpp
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
mapserver: added 'alias' property into feature attribute properties of GetProjectSettings response
mapserver: excluding of not allowed WMS feature attributes from GetFeatureInfo response in GML format
[layertree] update insertion point to layer tree when appropriate
[layertree] Preserve the order of layers when adding several layers at once
[TRANSUP] gl by Xan and hu by Zoltan

Signed-off-by: Werner Macho <werner.macho@gmail.com>
Updated IT GUI translation
Fix #10412 (option whether to show newly added layers)
[processing] handle non-ASCII characters in modeller algorithm list
Fix LineEdit edit type conversion warning

http://lists.osgeo.org/pipermail/qgis-developer/2014-June/032942.html
[composer] Allow clicking-dragging to set size of labels, pictures, legends ands tables when adding them to a composition (fix #9821)
[composer] Mark project dirty when additional composer related changes occur (fix #7470)
Trying to fix #10164 (crash on zoom in/out)

This happens due to infinite recursion when syncing extent between
map canvas and map renderer. Not entirely sure why, seems to happen
only on 32bit systems.
Event layer function: catch various error cases for line offsets
fixing some UI bugs in settings dialog

Signed-off-by: Werner Macho <werner.macho@gmail.com>