jnjk
Merge branch 'master' of https://github.com/gormed/ubicomp_h5n1
ignored settings folder

Signed-off-by: gormed <hans.ferchland@gmx.de>
Merge branch 'master' of github.com:gormed/ubicomp_h5n1
vibration, ordnung geändert

vibration eingebaut, die gesture erkennung ausgelagert
Create Device SQL Table
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
adjusted php, register Device
added specific patterns

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

Signed-off-by: gormed <hans.ferchland@gmx.de>
Merge branch 'uiproto'
Merge branch 'tts'
nichts wichtiges
merged
...