Merge branch 'master' of https://github.com/mip-it/hostage

Conflicts:
	bin/classes/de/tudarmstadt/informatik/hostage/ui/MainActivity$1.class
	bin/classes/de/tudarmstadt/informatik/hostage/ui/MainActivity$2.class
	bin/classes/de/tudarmstadt/informatik/hostage/ui/MainActivity$3.class
	bin/classes/de/tudarmstadt/informatik/hostage/ui/MainActivity$4.class
	bin/classes/de/tudarmstadt/informatik/hostage/ui/MainActivity$5.class
	bin/classes/de/tudarmstadt/informatik/hostage/ui/MainActivity.class