Merge pull request #14 from MediaBrowser/master

Sync
Rearrange the order for WakeOnLan and use difference timeouts depending on networktype
Merge pull request #15 from 7illusions/master

Faster Connect for RemoteConnections