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

Conflicts:
	src/com/example/budgetmanager/AddBudgetActivity.java
Fixed some small stuff
Merge branch 'master' of https://github.com/coldstar96/cse403 into edit

Conflicts:
	src/com/example/budgetmanager/AddBudgetActivity.java
Removes the temporary budget created
merged with tabbed-app
Deleted the incorrect set statements
Merge branch 'master' of https://github.com/coldstar96/cse403 into edit

Conflicts:
	res/values/strings.xml
Merge branch 'master' of https://github.com/coldstar96/cse403 into summaryfragment
made summary screen a fragment of main activity
merged with joseph's branch
Fixed a NullPointerException in AddEntryActivity
Merge pull request #117 from coldstar96/addentryactivity-fix

Fixed a NullPointerException in AddEntryActivity
Merge branch 'master' into edit-delete-entries-in-entry-logs
merged with master
Added boolean for add mode.
Fixed styles
Merge branch 'master' of https://github.com/coldstar96/cse403 into edit

Conflicts:
	res/values/strings.xml
	src/com/example/budgetmanager/EntryLogsActivity.java
Merge pull request #106 from coldstar96/editBudget

Added the edit budget functionality
merged with master