test
Merge branch 'master' of https://github.com/bam14053/ViennaTourGuide

Conflicts:
	bin/classes/bamgbala/hasler/viennatourguide/R$id.class
	bin/classes/bamgbala/hasler/viennatourguide/R$layout.class
	bin/classes/bamgbala/hasler/viennatourguide/R$menu.class
	bin/classes/bamgbala/hasler/viennatourguide/R$string.class
	bin/classes/bamgbala/hasler/viennatourguide/R$style.class