zhCN locale

first commit
Update NxSocial.lua

changed InCombatLockdown() ~= nil to InCombatLockdown() ~= false

now Punk List gets updated
Merge pull request #1 from Raka-loah/master

zhCN locale
Merge pull request #3 from IrcDirk/master

Update NxSocial.lua
11/8 Commit 1

Current WIP with previous pulls included.
Merge branch 'master' of https://github.com/Rythal/Carbonite

Conflicts:
	.gitignore