CORE: fix @injectaction for JA, spell and WS actions
Merge branch 'master' of https://github.com/DarkstarProject/darkstar