With fixes after putting into trunk
Fix Compiler Warnings that were introduced with the merge from the last Branch (lp:~chris-thomas/openpetraorg/dev_20140424_Finance_CurrencyWorkerField).