moved stuff around, not yet done wiht it. added actionmanager stuff
small changes to skillmanager
Merge remote-tracking branch 'origin/beta'
stuff