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
Merge branch 'master' into colour_functions
Merge pull request #531 from ccrook/colour_functions

Colour functions