chat.php added
Merge branch 'master' into chat
system.php added
Merge branch 'system' into development
Merge branch 'chat' into development