Merge branch 'master' of https://github.com/cxchope/CloudEmoticon2iOS

Conflicts:
CloudEmoticon2iOS/language-en.plist