Branch Stryker... but all Fox updates.. Oops

Basically fox is done.. lol
Merge Stryker with master
Merge branch 'master' into UserInterface