merge from lp:~chris-thomas/openpetraorg/dev_20141212_Finance_GiftGLTesting13
https://tracker.openpetra.org/view.php?id=3688
merge from lp:~chris-thomas/openpetraorg/dev_20141212_Finance_GiftGLTesting14
merge from lp:~chris-thomas/openpetraorg/dev_20141217_Finance_GiftGLTesting15