Merged plugin of the individual patches
Fixed some clipping between the two mods
New navmesh for locations that needed it