update library
fix merge conflicts
Merge branch 'master' of github.com:fahrgemeinschaft/android-app
removed spenden functionality
Merge branch 'master' of github.com:fahrgemeinschaft/android-app

Conflicts:
	libs/android-library.aar