Added ASP.NET Identity files (unmodified); resolved some remaining merge errors.