some changes… try to collide things
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
Create Device SQL Table
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'
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'