logbuch smartphone land,port
merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	SeapalAndroidApp/project.properties
	SeapalAndroidApp/test/gen/de/htwg/seapal/test/R.java