Implemented custom TripAdapter
Merge remote-tracking branch 'origin/master'

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml
	src/main/java/be/kdg/TripsApp/MainActivity.java
Merge