Merge Development into Master

[Doomsdayrs]

Description of the Change

Develop was made to handle some commit shenanigans that occurred on master.

We should now prepare to merge, and resolve the divergence of the code base.

[RyanTheAllmighty]

So I think the plan here will be that I'll do a release tonight off master and then update develop. I'll start testing develop to make sure it's working as intended and get a list of things that might be broken or need fixing.

Then after at least a couple days for any hotfixes to master, can merge this in and then print another release once any issues are fixed.

[RyanTheAllmighty]

Release is done, will monitor for any hotfixes needed. Merged master into develop also and fixed a bunch of conflicts.

@Doomsdayrs if you get a chance in the next few days, can you just test around the app and look for any oddities. There's a lot of your architectural stuff mainly. I'm also going to spend some time looking around once I fix my dev environment, which has never liked this branch

[RyanTheAllmighty]

Closed as this has been merged manually with 0b5040f