Merge pull request #4 from chanz/master

Added 2 functions in weapons.inc
Fixed function Entity_TakeHealth setting the wrong health
Merge branch 'master' of github.com:bcserv/smlib
Fixed wrong constant used in function Client_FindByName - fixes #3
Merge branch 'master' into feature-pluginmanager
Changed categories for global variables also added 'Timer' for timer variables as category
Changed formating for functions to match the include files