s
Merge branch 'master' of https://medien.informatik.uni-ulm.de/git/mind_server
wifi stuff
Merge branch 'master' of https://medien.informatik.uni-ulm.de/git/mind_server
defaulticon fix
continued polling on pd
Merge branch 'master' of https://medien.informatik.uni-ulm.de/git/mind_server
showWifi
Merge branch 'master' of https://medien.informatik.uni-ulm.de/git/mind_server
stuff