Merge from trunk
Fixes to CCCode
Cost Centre Code Fix
merge from lp:~chris-thomas/openpetraorg/dev_20141118_Finance_GiftGLTesting3