Merge pull request #139 from CoryShiraishi/master

Added Emoticons, sounds, and fixed some connectivity bugs
Fixed FindBugs error
Merge pull request #140 from taylorsw/master

Fixed FindBugs bug