Merge branch 'master' of github.com:stefangoelles/mitfahrapp into luki_jonny
<LG,JL> <1.01> asdfasdfasdfasdf
fixed bugs, fixed read in variables
fixed
nothing
asdf
ActivityCheckTrip
ActivityCheckTrip add *
ActivityCheckTrips done (without database)
[1.01] another try of merging (LG,JL)
[1.01]keine ahnung was git will(LG, JL)
[1.01]keine ahnung was git will(LG, JL)
fix merge conflicts
fix merge conflicts
Merge branch 'master' of github.com:stefangoelles/mitfahrapp

Conflicts:
	MitfahrApp1/bin/MitfahrApp1.apk
	MitfahrApp1/bin/classes.dex
	MitfahrApp1/bin/classes/com/mitfahr/ActivityOwnrides.class
	MitfahrApp1/bin/classes/com/mitfahr/ActivityRide.class
	MitfahrApp1/bin/classes/com/mitfahr/ActivityTrip.class
	MitfahrApp1/bin/classes/com/mitfahr/R$layout.class
	MitfahrApp1/bin/classes/com/mitfahr/R$menu.class
	MitfahrApp1/bin/resources.ap_
	MitfahrApp1/gen/com/mitfahr/R.java
	MitfahrApp1/src/com/mitfahr/ActivityTrip.java
[1.01]fixed merge conflicts, cleanup, is working - ownrides #not(LG, JL)
Merge branch 'luki_jonny'

Conflicts:
	MitfahrApp1/bin/AndroidManifest.xml
	MitfahrApp1/bin/MitfahrApp1.apk
	MitfahrApp1/bin/classes.dex
	MitfahrApp1/bin/classes/com/mitfahr/ActivityImpressum.class
	MitfahrApp1/bin/classes/com/mitfahr/ActivityOwnTrips.class
	MitfahrApp1/bin/classes/com/mitfahr/ActivityOwnrides.class
	MitfahrApp1/bin/classes/com/mitfahr/ActivityRide.class
	MitfahrApp1/bin/classes/com/mitfahr/ActivityTrip.class
	MitfahrApp1/bin/classes/com/mitfahr/MainWindow.class
	MitfahrApp1/bin/classes/com/mitfahr/R$layout.class
	MitfahrApp1/bin/classes/com/mitfahr/R$menu.class
	MitfahrApp1/bin/classes/com/mitfahr/R$string.class
	MitfahrApp1/bin/classes/com/mitfahr/R$style.class
	MitfahrApp1/bin/classes/com/mitfahr/database/FahrtenModel.class
	MitfahrApp1/bin/resources.ap_
	MitfahrApp1/gen/com/mitfahr/R.java
	MitfahrApp1/src/com/mitfahr/ActivityTrip.java