Merge pull request #4 from EQEmu/master

sync
Merge pull request #5 from EQEmu/master

sync
CHA scribe rule logic fix
Merge branch 'master' of https://github.com/josheb/Server
Merge pull request #60 from josheb/master

CHA scribe logic fix.
Merge branch 'master' into lua