WIP
Merge branch 'master' into colour_functions
Colour functions and en-US help files implemented.
Fixed indentation in qgsexpression.cpp
Code name consistency fix and unit tests for functions
Small update to Mac notes in INSTALL
Make sure Analysis menu (sextante) shows up before Window menu on Mac
Enable pal label testing to qgis_bench
Add workaround for loading forms with custom widgets from PyQt4

	More information: qt-project.org/forums/viewthread/27098/
ftools-fix  split vector layer
Merge pull request #556 from vinayan/splitVector

[Fix #7618] - split vector layer does not work in master
[pyqgis-console] fix object inspector on windows 7
- minor fixes
osgeo4w: make batch files location independant
add cpt-city selections to distribution
change QGis to QGIS
add ramp count to selection info label
add simple help to cpt-city dialog
fix cpt-city loading of invalid (non-existent) ramps in Seleections
Always set "SHAPE_ENCODING" GDAL config option to "" in QgsVectorFileWriter (follows up commit:c0551a6)
Set the ENCODING layer creation option when creating a new empty Shapefile. Thanks to Minoru Akagi.