data picker , search bar
Merge branch 'master' of https://github.com/marcokstephen/BackpackPlanner

Conflicts:
	res/layout/activity_new_trip.xml
	res/values/strings.xml