Updated to new version or swagger from upstream, properly implemented alphabetization of resources