Fixed include bug.
Merge branch 'feature-20140918-group-chat' into 20140401-dev-stable