Removing mock budget objects
Merge remote-tracking branch 'origin/develop' into develop
Fixing budget tests and removing uneeded objects from demo