Fixed Edit Methods and added OrderBy to List Methods
Clear changes on my local
Merge branch 'master' of https://github.com/OITCST326/JuniorProject

Conflicts:
	AIM/AIM.v12.suo
	AIM/AIM/AIM.Client.Entities/bin/Debug/AIM.Client.Entities.dll
	AIM/AIM/AIM.Client.Entities/bin/Debug/AIM.Client.Entities.dll.config
	AIM/AIM/AIM.Client.Entities/bin/Debug/AIM.Client.Entities.pdb
	AIM/AIM/AIM.Client.Entities/bin/Debug/Newtonsoft.Json.xml
	AIM/AIM/AIM.Client.Entities/bin/Debug/TrackableEntities.Client.xml
	AIM/AIM/AIM.Client.Entities/bin/Debug/TrackableEntities.Common.xml
	AIM/AIM/AIM.Client.Entities/obj/Debug/AIM.Client.Entities.csproj.FileListAbsolute.txt
	AIM/AIM/AIM.Client.Entities/obj/Debug/AIM.Client.Entities.dll
	AIM/AIM/AIM.Client.Entities/obj/Debug/AIM.Client.Entities.pdb
	AIM/AIM/AIM.Client.Entities/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	AIM/AIM/AIM.ConsoleClient/bin/Debug/AIM.Client.Entities.dll
	AIM/AIM/AIM.ConsoleClient/bin/Debug/AIM.Client.Entities.pdb
	AIM/AIM/AIM.ConsoleClient/bin/Debug/AIM.ConsoleClient.exe
	AIM/AIM/AIM.ConsoleClient/bin/Debug/AIM.ConsoleClient.exe.config
	AIM/AIM/AIM.ConsoleClient/bin/Debug/AIM.ConsoleClient.pdb
	AIM/AIM/AIM.ConsoleClient/bin/Debug/AIM.Service.Core.dll
	AIM/AIM/AIM.ConsoleClient/bin/Debug/AIM.Service.Core.pdb
	AIM/AIM/AIM.ConsoleClient/bin/Debug/AIM.Service.Entities.dll
	AIM/AIM/AIM.ConsoleClient/bin/Debug/AIM.Service.Entities.pdb
	AIM/AIM/AIM.ConsoleClient/bin/Debug/EntityFramework.xml
	AIM/AIM/AIM.ConsoleClient/bin/Debug/Newtonsoft.Json.xml
	AIM/AIM/AIM.ConsoleClient/bin/Debug/System.Net.Http.Formatting.xml
	AIM/AIM/AIM.ConsoleClient/bin/Debug/TrackableEntities.Client.xml
	AIM/AIM/AIM.ConsoleClient/bin/Debug/TrackableEntities.Common.xml
	AIM/AIM/AIM.ConsoleClient/bin/Debug/TrackableEntities.EF.6.xml
	AIM/AIM/AIM.ConsoleClient/obj/Debug/AIM.ConsoleClient.csproj.FileListAbsolute.txt
	AIM/AIM/AIM.ConsoleClient/obj/Debug/AIM.ConsoleClient.csprojResolveAssemblyReference.cache
	AIM/AIM/AIM.ConsoleClient/obj/Debug/AIM.ConsoleClient.exe
	AIM/AIM/AIM.ConsoleClient/obj/Debug/AIM.ConsoleClient.pdb
	AIM/AIM/AIM.ConsoleClient/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	AIM/AIM/AIM.Service.Administrative/bin/Debug/AIM.Service.Core.dll
	AIM/AIM/AIM.Service.Administrative/bin/Debug/AIM.Service.Core.dll.config
	AIM/AIM/AIM.Service.Administrative/bin/Debug/AIM.Service.Core.pdb
	AIM/AIM/AIM.Service.Administrative/bin/Debug/AIM.Service.Entities.dll
	AIM/AIM/AIM.Service.Administrative/bin/Debug/AIM.Service.Entities.pdb
	AIM/AIM/AIM.Service.Administrative/bin/Debug/EntityFramework.SqlServer.xml
	AIM/AIM/AIM.Service.Administrative/bin/Debug/EntityFramework.xml
	AIM/AIM/AIM.Service.Administrative/bin/Debug/Newtonsoft.Json.xml
	AIM/AIM/AIM.Service.Administrative/bin/Debug/System.Net.Http.Formatting.xml
	AIM/AIM/AIM.Service.Administrative/bin/Debug/TrackableEntities.Common.xml
	AIM/AIM/AIM.Service.Administrative/bin/Debug/TrackableEntities.EF.6.xml
	AIM/AIM/AIM.Service.Administrative/obj/Debug/AIM.Service.Administrative.csproj.FileListAbsolute.txt
	AIM/AIM/AIM.Service.Administrative/obj/Debug/AIM.Service.Administrative.csprojResolveAssemblyReference.cache
	AIM/AIM/AIM.Service.Administrative/obj/Debug/AIM.Service.Core.dll
	AIM/AIM/AIM.Service.Administrative/obj/Debug/AIM.Service.Core.pdb
	AIM/AIM/AIM.Service.Administrative/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	AIM/AIM/AIM.Service.Entities/bin/Debug/AIM.Service.Entities.dll
	AIM/AIM/AIM.Service.Entities/bin/Debug/AIM.Service.Entities.dll.config
	AIM/AIM/AIM.Service.Entities/bin/Debug/AIM.Service.Entities.pdb
	AIM/AIM/AIM.Service.Entities/bin/Debug/EntityFramework.SqlServer.xml
	AIM/AIM/AIM.Service.Entities/bin/Debug/EntityFramework.xml
	AIM/AIM/AIM.Service.Entities/bin/Debug/Newtonsoft.Json.xml
	AIM/AIM/AIM.Service.Entities/bin/Debug/System.Net.Http.Formatting.xml
	AIM/AIM/AIM.Service.Entities/bin/Debug/TrackableEntities.Common.xml
	AIM/AIM/AIM.Service.Entities/bin/Debug/TrackableEntities.EF.6.xml
	AIM/AIM/AIM.Service.Entities/obj/Debug/AIM.Service.Entities.csproj.FileListAbsolute.txt
	AIM/AIM/AIM.Service.Entities/obj/Debug/AIM.Service.Entities.dll
	AIM/AIM/AIM.Service.Entities/obj/Debug/AIM.Service.Entities.pdb
	AIM/AIM/AIM.Service.Entities/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	AIM/AIM/AIM.Web.Admin.Tests/bin/Debug/AIM.Service.Entities.dll
	AIM/AIM/AIM.Web.Admin.Tests/bin/Debug/AIM.Service.Entities.pdb
	AIM/AIM/AIM.Web.Admin.Tests/bin/Debug/AIM.Web.Admin.Tests.dll
	AIM/AIM/AIM.Web.Admin.Tests/bin/Debug/AIM.Web.Admin.Tests.dll.config
	AIM/AIM/AIM.Web.Admin.Tests/bin/Debug/AIM.Web.Admin.Tests.pdb
	AIM/AIM/AIM.Web.Admin.Tests/bin/Debug/AIM.Web.Admin.dll
	AIM/AIM/AIM.Web.Admin.Tests/bin/Debug/AIM.Web.Admin.pdb
	AIM/AIM/AIM.Web.Admin.Tests/bin/Debug/EntityFramework.xml
	AIM/AIM/AIM.Web.Admin.Tests/bin/Debug/Microsoft.AspNet.Identity.Core.xml
	AIM/AIM/AIM.Web.Admin.Tests/bin/Debug/Microsoft.AspNet.Identity.EntityFramework.xml
	AIM/AIM/AIM.Web.Admin.Tests/bin/Debug/Microsoft.AspNet.Identity.Owin.xml
	AIM/AIM/AIM.Web.Admin.Tests/bin/Debug/Microsoft.Owin.Host.SystemWeb.xml
	AIM/AIM/AIM.Web.Admin.Tests/bin/Debug/Microsoft.Owin.Security.Cookies.xml
	AIM/AIM/AIM.Web.Admin.Tests/bin/Debug/Microsoft.Owin.Security.xml
	AIM/AIM/AIM.Web.Admin.Tests/bin/Debug/Microsoft.Owin.xml
	AIM/AIM/AIM.Web.Admin.Tests/bin/Debug/Newtonsoft.Json.xml
	AIM/AIM/AIM.Web.Admin.Tests/bin/Debug/System.Net.Http.Formatting.xml
	AIM/AIM/AIM.Web.Admin.Tests/bin/Debug/System.Web.Helpers.xml
	AIM/AIM/AIM.Web.Admin.Tests/bin/Debug/System.Web.Http.WebHost.xml
	AIM/AIM/AIM.Web.Admin.Tests/bin/Debug/System.Web.Http.xml
	AIM/AIM/AIM.Web.Admin.Tests/bin/Debug/System.Web.Mvc.xml
	AIM/AIM/AIM.Web.Admin.Tests/bin/Debug/System.Web.Optimization.xml
	AIM/AIM/AIM.Web.Admin.Tests/bin/Debug/System.Web.Razor.xml
	AIM/AIM/AIM.Web.Admin.Tests/bin/Debug/System.Web.WebPages.Deployment.xml
	AIM/AIM/AIM.Web.Admin.Tests/bin/Debug/System.Web.WebPages.Razor.xml
	AIM/AIM/AIM.Web.Admin.Tests/bin/Debug/System.Web.WebPages.xml
	AIM/AIM/AIM.Web.Admin.Tests/bin/Debug/TrackableEntities.Common.xml
	AIM/AIM/AIM.Web.Admin.Tests/obj/Debug/AIM.Web.Admin.Tests.csproj.FileListAbsolute.txt
	AIM/AIM/AIM.Web.Admin.Tests/obj/Debug/AIM.Web.Admin.Tests.csprojResolveAssemblyReference.cache
	AIM/AIM/AIM.Web.Admin.Tests/obj/Debug/AIM.Web.Admin.Tests.dll
	AIM/AIM/AIM.Web.Admin.Tests/obj/Debug/AIM.Web.Admin.Tests.pdb
	AIM/AIM/AIM.Web.Admin.Tests/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	AIM/AIM/AIM.Web.Admin/bin/AIM.Service.Core.dll
	AIM/AIM/AIM.Web.Admin/bin/AIM.Service.Core.pdb
	AIM/AIM/AIM.Web.Admin/bin/AIM.Service.Entities.dll
	AIM/AIM/AIM.Web.Admin/bin/AIM.Service.Entities.pdb
	AIM/AIM/AIM.Web.Admin/bin/AIM.Web.Admin.dll
	AIM/AIM/AIM.Web.Admin/bin/AIM.Web.Admin.dll.config
	AIM/AIM/AIM.Web.Admin/bin/AIM.Web.Admin.pdb
	AIM/AIM/AIM.Web.Admin/bin/EntityFramework.SqlServer.xml
	AIM/AIM/AIM.Web.Admin/bin/EntityFramework.xml
	AIM/AIM/AIM.Web.Admin/bin/Microsoft.AspNet.Identity.Core.xml
	AIM/AIM/AIM.Web.Admin/bin/Microsoft.AspNet.Identity.EntityFramework.xml
	AIM/AIM/AIM.Web.Admin/bin/Microsoft.AspNet.Identity.Owin.xml
	AIM/AIM/AIM.Web.Admin/bin/Microsoft.Owin.Host.SystemWeb.xml
	AIM/AIM/AIM.Web.Admin/bin/Microsoft.Owin.Security.Cookies.xml
	AIM/AIM/AIM.Web.Admin/bin/Microsoft.Owin.Security.Facebook.xml
	AIM/AIM/AIM.Web.Admin/bin/Microsoft.Owin.Security.Google.xml
	AIM/AIM/AIM.Web.Admin/bin/Microsoft.Owin.Security.MicrosoftAccount.xml
	AIM/AIM/AIM.Web.Admin/bin/Microsoft.Owin.Security.OAuth.xml
	AIM/AIM/AIM.Web.Admin/bin/Microsoft.Owin.Security.Twitter.xml
	AIM/AIM/AIM.Web.Admin/bin/Microsoft.Owin.Security.xml
	AIM/AIM/AIM.Web.Admin/bin/Microsoft.Owin.xml
	AIM/AIM/AIM.Web.Admin/bin/Newtonsoft.Json.xml
	AIM/AIM/AIM.Web.Admin/bin/System.Net.Http.Formatting.xml
	AIM/AIM/AIM.Web.Admin/bin/System.Web.Helpers.xml
	AIM/AIM/AIM.Web.Admin/bin/System.Web.Http.WebHost.xml
	AIM/AIM/AIM.Web.Admin/bin/System.Web.Http.xml
	AIM/AIM/AIM.Web.Admin/bin/System.Web.Mvc.xml
	AIM/AIM/AIM.Web.Admin/bin/System.Web.Optimization.xml
	AIM/AIM/AIM.Web.Admin/bin/System.Web.Razor.xml
	AIM/AIM/AIM.Web.Admin/bin/System.Web.WebPages.Deployment.xml
	AIM/AIM/AIM.Web.Admin/bin/System.Web.WebPages.Razor.xml
	AIM/AIM/AIM.Web.Admin/bin/System.Web.WebPages.xml
	AIM/AIM/AIM.Web.Admin/bin/TrackableEntities.Common.xml
	AIM/AIM/AIM.Web.Admin/bin/TrackableEntities.EF.6.xml
	AIM/AIM/AIM.Web.Admin/bin/WebMatrix.Data.xml
	AIM/AIM/AIM.Web.Admin/obj/Debug/AIM.Web.Admin.csproj.FileListAbsolute.txt
	AIM/AIM/AIM.Web.Admin/obj/Debug/AIM.Web.Admin.csprojResolveAssemblyReference.cache
	AIM/AIM/AIM.Web.Admin/obj/Debug/AIM.Web.Admin.dll
	AIM/AIM/AIM.Web.Admin/obj/Debug/AIM.Web.Admin.pdb
	AIM/AIM/AIM.Web.Admin/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Updated gridview in each index
fixed git ignor