Merge branch 'master' of https://github.com/GT-Deck/SMRS-AndroidClient

Conflicts:
SMRSRemote/src/com/decker/smrsremote/UdpClient.java
Syntax fixes