Added device name to server name.
Merge branch 'dev' of https://github.com/mamidenn/androidlab into dev