Merge from latest trunk
Improve error handling for CC Code
merge from lp:~chris-thomas/openpetraorg/dev_20141120_Finance_GiftGLTesting5