.
Merge branch 'Oliver' of https://github.com/os299/GuenstigerTanken into Oliver
Merge branch 'Oliver' of https://github.com/os299/GuenstigerTanken into Oliver
Added comments to all classes.
Merge branch 'feat/Calieston' of
https://github.com/os299/GuenstigerTanken.git into Oliver

Conflicts:
	bin/GuenstigerTanken.apk
	bin/classes.dex
	bin/classes/de/hdm/guenstigertanken/DetailActivity$1.class
	bin/classes/de/hdm/guenstigertanken/DetailActivity$2.class
	bin/classes/de/hdm/guenstigertanken/DetailActivity$3.class
	bin/classes/de/hdm/guenstigertanken/DetailActivity.class
	bin/classes/de/hdm/guenstigertanken/MainActivity$1.class
	bin/classes/de/hdm/guenstigertanken/MainActivity$2.class
	bin/classes/de/hdm/guenstigertanken/MainActivity$3.class
	bin/classes/de/hdm/guenstigertanken/MainActivity$4.class
	bin/classes/de/hdm/guenstigertanken/MainActivity$5.class
	bin/classes/de/hdm/guenstigertanken/MainActivity.class
	bin/resources.ap_