[4.01][design](TF,LG) changed other files
[4.01][design](TF,LG) changed files
Merge branch 'design' of github.com:stefangoelles/mitfahrapp into design

Conflicts:
	MitfahrApp1/res/layout/activity_getride.xml