Added the edit budget functionality
Merge branch 'master' into edit

Conflicts:
	src/com/example/budgetmanager/AddBudgetActivity.java