2 warnings fixed
merge from lp:~chris-thomas/openpetraorg/dev_20130702_Finance_Budgets5
merge from lp:openpetraorg