Merge pull request #37 from cosmebandola1331/master

Fixed Theme Incompatibility Problem with Packing List
Added Events Class and Events Bag List View
Merge branch 'master' of https://github.com/CST316GroupO/Travellight

Conflicts:
	app/src/main/AndroidManifest.xml
Added eventsBag to the AndroidManifest
Added all the activies to the MainScreen actionbar, removed background from helpscreen
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
Deleted unnecessary files. Fixed travel.png
Fixing more travel.png images
Adding ant build.xml file and resources
Editing build.xml for Jenkins (not finished)
Added Friends page as a fragment that's opened under the Trip Activity
Adding ant dependencies for google play services
Moving google play dependencies to lib for consistency