Fix for #6649.
Fix for #7330.
Fix for #7324.
Merge pull request #7332 from Segrain/master

Bugfixes.
Fix for #6476.
Fix for #6643.
Fix for #7322.
Merge pull request #7339 from Segrain/master

Bugfixes.
Merge branch 'master' of https://github.com/Baystation12/Baystation12
Revert "Updates from BS12"

This reverts commit 614f650b88837f32c680b8f397f1cbda0426ae26.

Conflicts:
	Update.bat
Fixed Mechas