wlan, room refactored
Merge branch 'master' of github.com:HTWK-App/Smartphone-App