Follower moving combat skills fix (hopefully)
Skills
Fixes
Merge branch 'master' into vm

Conflicts:
	engine.lua
	skills.lua
Skills bugfixes and stuff
Skills
Characters up to EP6
I don't remember what changes to skills lol
EX2 and EP7 characters and skills
EP6 stuff
Merge branch 'vm' of https://github.com/lightalkmst/sgre into lightalkmst-vm

* 'vm' of https://github.com/lightalkmst/sgre:
  EX2 and EP7 characters and skills
  Characters up to EP6 I don't remember what changes to skills lol
  Skills
  Skills bugfixes and stuff
  Fixes
  Skills
  Follower moving combat skills fix (hopefully)

Conflicts:
	characters.lua
	skills.lua