Add Comments and Emoticons modules
Merge branch 'master' into kirsle.net