Fixed merge errors and fixed edit profile

Also got rid of commented out code in AdminNav.ascx