create activity_search_results for show trips selected
Merge branch 'master' into robospice-test-implementation

Conflicts:
	src/main/AndroidManifest.xml
Merge pull request #2 from parquetn/robospice-test-implementation

Tu n'as pas l'air de voir la PR... Je la valide donc ! ^^
Merge branch 'master' into user-profile

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