Added Emoticon class
Added initial logic for loading emoticons
Merge branches