Merge pull request #30 from ejorreto/master

Pull request, back to sparkfun base.
Quick Fix  that Server-mode works again
Quick Fix  that Server-mode works again
cherry-pick merge from https://github.com/ejorreto/WiFly/commit/71e5b00c1a11aead4ea3ba252cc31663be3c46be
Merge commit '7ff49009cbcecbb39edfabe319c51a4617ebdd32' : Fix broker server mode

# By Jonas Hagberg
# Via Jonas Hagberg (1) and Toni Klopfenstein (1)
* commit '7ff49009cbcecbb39edfabe319c51a4617ebdd32':
  cherry-pick merge from https://github.com/ejorreto/WiFly/commit/71e5b00c1a11aead4ea3ba252cc31663be3c46be
  Quick Fix  that Server-mode works again
  Quick Fix  that Server-mode works again