event dropdown bar
jetzt reichts
merge
Merge branch 'appHardware-Services' of https://github.com/gormed/ubicomp_h5n1 into appHardware-Services

Conflicts:
	iseesomethingyoudont/gen/com/ubicomp/iseesomethingyoudont/R.java
added RFID control activity
Merge branch 'appHardware-Services' of https://github.com/gormed/ubicomp_h5n1 into appHardware-Services
merge
required hardware check

kills app, if not no required hardware
merge
required hardware check

kills app, if not no required hardware
somechanges
Revert "merge"

This reverts commit 8302b8dd44ba30f1a42994251bd7c9b25a9b5cce.

Signed-off-by: gormed <hans.ferchland@gmx.de>
Merge branch 'appHardware-Services' of github.com:gormed/ubicomp_h5n1 into appHardware-Services
added first steps 4 buggy cenario
reverted changes

Signed-off-by: gormed <hans.ferchland@gmx.de>
merge
…
gitignore
klappt wieder
add blinddog2 folder to repro