some entries
Merge branch 'master' of https://github.com/markuswindegger/SASAbus

Conflicts:
	.classpath
	AndroidManifest.xml
	project.properties
	src/it/sasabz/android/sasabus/InfoActivity.java
	src/it/sasabz/android/sasabus/TabHostActivity.java
	src/it/sasabz/android/sasabus/classes/services/InformationList.java
merge putzi with my master