diff --git a/.gitignore b/.gitignore
index fe0480a..451301b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,16 +25,14 @@ obj/
*.sbr
AIAHTML5.ADMIN.API/*
-!AIAHTML5.ADMIN.API/Gloabl.asax
-!AIAHTML5.ADMIN.API/Gloabl.cs
+!AIAHTML5.ADMIN.API/Global.asax
+!AIAHTML5.ADMIN.API/Global.cs
!AIAHTML5.ADMIN.API/Scripts
AIAHTML5.API/*
-!AIAHTML5.API/Gloabl.asax
-!AIAHTML5.API/Gloabl.cs
-Admin/src/
-Admin/e2e
-Admin/Properties
-Admin/wwwroot
+!AIAHTML5.API/Global.asax
+!AIAHTML5.API/Global.cs
+Admin/*
+!Admin/dist
[Rr]elease*/
_ReSharper*/
diff --git a/150-DOCUMENTATION/002-DBScripts/Admin/Store Procedure/usp_DeleteSubscriptionPlan.sql b/150-DOCUMENTATION/002-DBScripts/Admin/Store Procedure/usp_DeleteSubscriptionPlan.sql
index 57df976..fde68ea 100644
--- a/150-DOCUMENTATION/002-DBScripts/Admin/Store Procedure/usp_DeleteSubscriptionPlan.sql
+++ b/150-DOCUMENTATION/002-DBScripts/Admin/Store Procedure/usp_DeleteSubscriptionPlan.sql
diff --git a/150-DOCUMENTATION/002-DBScripts/Admin/Store Procedure/usp_GetEditions.sql b/150-DOCUMENTATION/002-DBScripts/Admin/Store Procedure/usp_GetEditions.sql
new file mode 100644
index 0000000..d501b25
--- /dev/null
+++ b/150-DOCUMENTATION/002-DBScripts/Admin/Store Procedure/usp_GetEditions.sql
diff --git a/150-DOCUMENTATION/002-DBScripts/Admin/Store Procedure/usp_GetLicenseById.sql b/150-DOCUMENTATION/002-DBScripts/Admin/Store Procedure/usp_GetLicenseById.sql
new file mode 100644
index 0000000..a3379c9
--- /dev/null
+++ b/150-DOCUMENTATION/002-DBScripts/Admin/Store Procedure/usp_GetLicenseById.sql
@@ -0,0 +1,74 @@
+SET QUOTED_IDENTIFIER ON
+GO
+SET ANSI_NULLS ON
+GO
+
+if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[usp_GetLicenseById]') and OBJECTPROPERTY(id, N'IsProcedure') = 1)
+drop procedure [dbo].[usp_GetLicenseById]
+GO
+-- ====================================================
+-- Author: Magic Software
+-- Create date: 29-Jan-2018
+-- Description: To get a license information on the basis of LicenseId
+-- ====================================================
+create PROCEDURE [dbo].[usp_GetLicenseById]
+ -- Add the parameters for the stored procedure here
+ @Id int
+AS
+BEGIN
+ -- SET NOCOUNT ON added to prevent extra result sets from
+ -- interfering with SELECT statements.
+ SET NOCOUNT ON;
+
+ declare @SubscriptionStartDate datetime, @SubscriptionEndDate datetime, @NoOfImages int, @TotalAmount money, @RenewalDate datetime,
+ @SiteIp varchar(100), @SiteIpTo varchar(100), @SiteMasterIPTo varchar(100);
+ declare @UserId int, @Login varchar(100), @Password varchar(100), @SecurityQuestionId int, @Answer varchar(100);
+ declare @EditionId int, @TotalLogins int;
+ declare @EditionLoginText varchar(1000);
+
+ declare CurEditionLogin cursor for
+ select EditionId, TotalLogins from LicenseToEdition where LicenseId = @Id;
+
+ set @EditionLoginText = '';
+ open CurEditionLogin
+ fetch NEXT FROM CurEditionLogin into @EditionId, @TotalLogins
+ while @@FETCH_STATUS = 0
+ begin
+ set @EditionLoginText = @EditionLoginText + convert(varchar(5), @EditionId) + '-' + convert(varchar(5), @TotalLogins) + '|';
+ fetch NEXT FROM CurEditionLogin into @EditionId, @TotalLogins
+ end
+ CLOSE CurEditionLogin
+ DEALLOCATE CurEditionLogin
+ set @EditionLoginText = SUBSTRING(@EditionLoginText, 1, len(@EditionLoginText) - 1);
+
+ select top 1
+ @SubscriptionStartDate = LSD.SubscriptionValidFrom,
+ @SubscriptionEndDate = LSD.SubscriptionValidThrough,
+ @RenewalDate = LSD.RenewalDate,
+ @NoOfImages = LSD.NoofImages,
+ @TotalAmount = LSD.TotalAmount
+ from LicenseSubscriptionDetail LSD where LSD.LicenseId = @Id order by LSD.Id desc;
+
+ select top 1 @SiteIp = S.SiteIP, @SiteIpTo = S.SiteIPTo, @SiteMasterIPTo = S.SiteMasterIPTo from Site S
+ inner join SiteToLicenseEdition SLE ON S.Id = SLE.SiteId
+ inner join LicenseToEdition LE on SLE.LicenseEditionId = LE.Id
+ where LE.LicenseId = @Id and S.IsMaster = 1 AND S.IsActive = 1 order by SLE.SiteId desc;
+
+ select top 1 @UserId = US.Id, @Login = US.LoginId, @Password = US.Password, @SecurityQuestionId = US.SecurityQuestionId,
+ @Answer = US.SecurityAnswer from AIAUserToLicenseEdition UL inner join LicenseToEdition LE on UL.LicenseEditionId = LE.Id
+ inner join AIAUser US on UL.UserId = US.Id where LE.LicenseId = @Id order by LE.Id desc;
+
+ select L.Id, L.LicenseTypeId, L.AccountNumber, L.AccountTypeId, L.Address1, L.Address2, L.LicenseeFirstName, L.LicenseeLastName, L.City,
+ L.CountryId, L.StateId, L.EmailId, L.InstitutionName, L.Phone, L.ProductId, L.Zip, L.TotalLogins, @EditionLoginText as EditionLogins,
+ @SubscriptionStartDate as SubscriptionStartDate, @SubscriptionEndDate as SubscriptionEndDate, @NoOfImages as NoOfImages, @TotalAmount as Price,
+ @SiteIp as SiteUrl, @SiteIpTo as SitToUrl, @SiteMasterIPTo as SiteMasterUrl, @UserId as UserId, @Login as Login, @Password as Password,
+ @SecurityQuestionId as SecurityQuestionId, @Answer as Answer, L.NoOfRenewals as TotalRenewals, @RenewalDate as RenewalDate, L.IsActive
+ from License L where L.Id = @Id;
+
+END
+
+GO
+SET QUOTED_IDENTIFIER OFF
+GO
+SET ANSI_NULLS ON
+GO
\ No newline at end of file
diff --git a/150-DOCUMENTATION/002-DBScripts/Admin/Store Procedure/usp_GetLicenseTypes.sql b/150-DOCUMENTATION/002-DBScripts/Admin/Store Procedure/usp_GetLicenseTypes.sql
new file mode 100644
index 0000000..4621556
--- /dev/null
+++ b/150-DOCUMENTATION/002-DBScripts/Admin/Store Procedure/usp_GetLicenseTypes.sql
diff --git a/150-DOCUMENTATION/002-DBScripts/Admin/Store Procedure/usp_GetLicenses.sql b/150-DOCUMENTATION/002-DBScripts/Admin/Store Procedure/usp_GetLicenses.sql
new file mode 100644
index 0000000..051b8c5
--- /dev/null
+++ b/150-DOCUMENTATION/002-DBScripts/Admin/Store Procedure/usp_GetLicenses.sql
diff --git a/150-DOCUMENTATION/002-DBScripts/Admin/Store Procedure/usp_GetSubscriptionPlans.sql b/150-DOCUMENTATION/002-DBScripts/Admin/Store Procedure/usp_GetSubscriptionPlans.sql
index c7ec30d..083cb42 100644
--- a/150-DOCUMENTATION/002-DBScripts/Admin/Store Procedure/usp_GetSubscriptionPlans.sql
+++ b/150-DOCUMENTATION/002-DBScripts/Admin/Store Procedure/usp_GetSubscriptionPlans.sql
diff --git a/150-DOCUMENTATION/002-DBScripts/Admin/Store Procedure/usp_InsertSubscriptionPlan.sql b/150-DOCUMENTATION/002-DBScripts/Admin/Store Procedure/usp_InsertSubscriptionPlan.sql
index 7bec445..ae4f426 100644
--- a/150-DOCUMENTATION/002-DBScripts/Admin/Store Procedure/usp_InsertSubscriptionPlan.sql
+++ b/150-DOCUMENTATION/002-DBScripts/Admin/Store Procedure/usp_InsertSubscriptionPlan.sql
diff --git a/150-DOCUMENTATION/002-DBScripts/Admin/Store Procedure/usp_UpdateSubscriptionPlan.sql b/150-DOCUMENTATION/002-DBScripts/Admin/Store Procedure/usp_UpdateSubscriptionPlan.sql
index 0540a18..e502a7c 100644
--- a/150-DOCUMENTATION/002-DBScripts/Admin/Store Procedure/usp_UpdateSubscriptionPlan.sql
+++ b/150-DOCUMENTATION/002-DBScripts/Admin/Store Procedure/usp_UpdateSubscriptionPlan.sql
diff --git a/400-SOURCECODE/.gitignore b/400-SOURCECODE/.gitignore
index 52c36f8..e867367 100644
--- a/400-SOURCECODE/.gitignore
+++ b/400-SOURCECODE/.gitignore
@@ -25,12 +25,12 @@ obj/
*.sbr
AIAHTML5.ADMIN.API/*
-!AIAHTML5.ADMIN.API/Gloabl.asax
-!AIAHTML5.ADMIN.API/Gloabl.cs
+!AIAHTML5.ADMIN.API/Global.asax
+!AIAHTML5.ADMIN.API/Global.cs
!AIAHTML5.ADMIN.API/Scripts
AIAHTML5.API/*
-!AIAHTML5.API/Gloabl.asax
-!AIAHTML5.API/Gloabl.cs
+!AIAHTML5.API/Global.asax
+!AIAHTML5.API/Global.cs
Admin/*
!Admin/dist
[Rr]elease*/
diff --git a/400-SOURCECODE/AIAHTML5.ADMIN.API/Web.config b/400-SOURCECODE/AIAHTML5.ADMIN.API/Web.config
deleted file mode 100644
index 5308430..0000000
--- a/400-SOURCECODE/AIAHTML5.ADMIN.API/Web.config
+++ /dev/null
@@ -1,83 +0,0 @@
-
-
-