added stuff
Merge branch 'master' of github.com:snSWIIue/ubicomp

Conflicts:
	assi4/muc13_4_OrtmannSchandar/src/de/uulm/muc13_4_OrtmannSchandar/MediaPlayerActivity.java
stuff