Post merge from trunk commit, with updates to demo data to work with new Budget Types.
merge from lp:~chris-thomas/openpetraorg/dev_20130702_Finance_Budgets5
merge from lp:openpetraorg