minor refactoring on WifiManager usage
Merge branch 'master' of https://github.com/PassionJHack/passion