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
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
reverted changes

Signed-off-by: gormed <hans.ferchland@gmx.de>
merge
klappt wieder
resolved merge issues

Signed-off-by: gormed <hans.ferchland@gmx.de>
fixed project setup and some merge issues;

Signed-off-by: gormed <hans.ferchland@gmx.de>
Merge branch 'model'
added untracked files
Merge branch 'appHardware-Services'

Conflicts:
	iseesomethingyoudont/AndroidManifest.xml
	iseesomethingyoudont/gen/com/ubicomp/iseesomethingyoudont/R.java
	iseesomethingyoudont/src/com/h5n1/hardwareServices/GestureServices.java
	iseesomethingyoudont/src/com/ubicomp/iseesomethingyoudont/ControlActivity.java

Signed-off-by: gormed <hans.ferchland@gmx.de>