New View Expense view/Activity with link to trip
Merge branch 'master' of https://github.com/Shardin91/CSE5236.git

Conflicts:
	BTA/AndroidManifest.xml
	BTA/res/values/strings.xml
	BTA/src/edu/osu/bta/valueobjects/ExpenseModel.java