added emoticons
merge branch 'master' of https://github.com/gardnerb/geosent