Merge pull request #38 from brandonespana/master

Added all the activies to the MainScreen actionbar, removed background from help screen
Trip Hub functionality: Add/Remove trips to/from file. Trips displayed and selected from a navigation drawer. Drawer is updated based on add/remove.
best commit of all time
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/res/values/strings.xml
Modified Strings.xml
	AndroidManifest.xml
	Base Yelp UI
	Base Yelp Search
Fix AndroidManifest Theme Bug
Fixes another manifest bug
triphub updates: icons and navigation to and from activities.
test commit