Add trip added
Change to manifest
Merge branch 'master' of https://github.com/slav40o/TravelBuddyAndroidApp

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml