Merge pull request #23 from ProjectSWGCore/master

pull
Removed modifier from movement till it works correctly
Merge pull request #1228 from zingzing175/master

pull
Merge pull request #1229 from ProjectSWGCore/master

merge