update admin fork with latest dev upgrades