Initial commit
Merge branch 'ASCChatBubble'
Merge branch 'master' into ASCChatBubble