new binddog2 project
kl fix
last change blind dog
php adjusted
create_device.php fix, jsonprototype adjusted for testing purposes
Merge branch 'model'
Merge branch 'appHardware-Services' of github.com:gormed/ubicomp_h5n1
modified nav event;

Signed-off-by: gormed <hans.ferchland@gmx.de>
Merge branch 'appHardware-Services'
Merge branch 'tts'

Conflicts:
	iseesomethingyoudont/src/com/ubicomp/iseesomethingyoudont/EventToSpeechSynthesis.java

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

Conflicts:
	.gitignore
	iseesomethingyoudont/src/com/ubicomp/iseesomethingyoudont/EventHandler.java

Signed-off-by: gormed <hans.ferchland@gmx.de>
some fixes for the eclipse warnings and cleanup of unused rubbish;

Signed-off-by: gormed <hans.ferchland@gmx.de>
functions.php, uiproto adjustments
get_all_events adjustment
Merge branch 'uiproto'
Merge branch 'master' into tts
php changes
Merge branch 'appHardware-Services'
Merge branch 'uiproto'
Merge branch 'appHardware-Services'

Conflicts:
	iseesomethingyoudont/src/com/ubicomp/iseesomethingyoudont/EventToSpeechSynthesis.java

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