added diary, diaryqueue, emoticon, emoticonQueue classes
Merge branch 'master' of https://github.com/yiochen/AndroidDiaryApp.git
Merge branch 'LEE' into leee
Merge branch 'master' into leee