merge from lp:~chris-thomas/openpetraorg/dev_20141205_Finance_GiftGLTesting12

https://tracker.openpetra.org/view.php?id=3663