jnjk
Merge branch 'master' of https://github.com/gormed/ubicomp_h5n1
some changes… try to collide things
ignored settings folder

Signed-off-by: gormed <hans.ferchland@gmx.de>
Merge branch 'master' of github.com:gormed/ubicomp_h5n1
Merge branch 'model' of https://github.com/gormed/ubicomp_h5n1 into model

Conflicts:
	blinddog/build/classes/com/blinddog/entities/Grass.class
	blinddog/build/classes/com/blinddog/entities/Person.class
vibration, ordnung geändert

vibration eingebaut, die gesture erkennung ausgelagert
some attempts to fix collision

Signed-off-by: gormed <hans.ferchland@gmx.de>
...
Merge branch 'model' of https://github.com/gormed/ubicomp_h5n1 into model
modified TTS synthesis

Signed-off-by: gormed <hans.ferchland@gmx.de>
Merge branch 'uiproto'
Merge branch 'model'
Merge branch 'tts'
hardware services ausgelagert

alle hservices liegen in separaten klassen, werden in controlactivity
nur mit der activity selbst (für den kontext) aufgerufen
added specific patterns

Signed-off-by: gormed <hans.ferchland@gmx.de>
Merge branch 'appHardware-Services' of github.com:gormed/ubicomp_h5n1
Merge branch 'uiproto'
Merge branch 'tts'
nichts wichtiges