Fixed device detection for binding to local and remote services

JIRA-Issue: APPTRAVEL-
Merge pull request #2 from easy-s/APPTRAVEL-X

Fixed device detection for binding to local and remote services