diff --git a/400-SOURCECODE/.vs/config/applicationhost.config b/400-SOURCECODE/.vs/config/applicationhost.config
index 6e2b323..848a313 100644
--- a/400-SOURCECODE/.vs/config/applicationhost.config
+++ b/400-SOURCECODE/.vs/config/applicationhost.config
@@ -162,7 +162,7 @@
             </site>
             <site name="AIAHTML5.API" id="2">
                 <application path="/" applicationPool="Clr4IntegratedAppPool">
-                    <virtualDirectory path="/" physicalPath="D:\100-PROJECTS\003-AIAHTML5\400-SOURCECODE\AIAHTML5.API" />
+                    <virtualDirectory path="/" physicalPath="D:\100-Projects\100-AIAHTML5\400-SOURCECODE\AIAHTML5.API" />
                 </application>
                 <bindings>
                     <binding protocol="http" bindingInformation="*:63874:localhost" />
@@ -170,7 +170,7 @@
             </site>
             <site name="AIAHTML5.Web" id="3">
                 <application path="/" applicationPool="Clr4IntegratedAppPool">
-                    <virtualDirectory path="/" physicalPath="D:\100-PROJECTS\003-AIAHTML5\400-SOURCECODE\AIAHTML5.Web" />
+                    <virtualDirectory path="/" physicalPath="D:\100-Projects\100-AIAHTML5\400-SOURCECODE\AIAHTML5.Web" />
                 </application>
                 <bindings>
                     <binding protocol="http" bindingInformation="*:55837:localhost" />
@@ -178,7 +178,7 @@
             </site>
             <site name="AIAHTML5.Admin" id="4">
                 <application path="/" applicationPool="Clr4IntegratedAppPool">
-                    <virtualDirectory path="/" physicalPath="D:\100-PROJECTS\003-AIAHTML5\400-SOURCECODE\AIAHTML5.Admin" />
+                    <virtualDirectory path="/" physicalPath="D:\100-Projects\100-AIAHTML5\400-SOURCECODE\AIAHTML5.Admin" />
                 </application>
                 <bindings>
                     <binding protocol="http" bindingInformation="*:61106:localhost" />
@@ -186,7 +186,7 @@
             </site>
             <site name="AIAHTML5.Server" id="5">
                 <application path="/" applicationPool="Clr4IntegratedAppPool">
-                    <virtualDirectory path="/" physicalPath="D:\100-PROJECTS\003-AIAHTML5\400-SOURCECODE\AIAHTML5.Server" />
+                    <virtualDirectory path="/" physicalPath="D:\100-Projects\100-AIAHTML5\400-SOURCECODE\AIAHTML5.Server" />
                 </application>
                 <bindings>
                     <binding protocol="http" bindingInformation="*:1830:localhost" />
diff --git a/400-SOURCECODE/AIAHTML5.Admin/app/app.module.js b/400-SOURCECODE/AIAHTML5.Admin/app/app.module.js
index a53ddbc..ff1fe04 100644
--- a/400-SOURCECODE/AIAHTML5.Admin/app/app.module.js
+++ b/400-SOURCECODE/AIAHTML5.Admin/app/app.module.js
@@ -19,12 +19,62 @@ var site_footer_component_1 = require('./shared/site-footer.component');
 var update_password_component_1 = require('./pages/update-password.component');
 var dashboard_component_1 = require('./pages/dashboard.component');
 var admin_update_profile_component_1 = require('./pages/admin-update-profile.component');
+var admin_change_password_component_1 = require('./pages/admin-change-password.component');
+var admin_change_user_id_component_1 = require('./pages/admin-change-user-id.component');
+var admin_search_license_component_1 = require('./pages/admin-search-license.component');
+var admin_add_new_license_component_1 = require('./pages/admin-add-new-license.component');
+var admin_setup_test_account_component_1 = require('./pages/admin-setup-test-account.component');
+var admin_manage_discount_code_component_1 = require('./pages/admin-manage-discount-code.component');
+var admin_subscription_price_component_1 = require('./pages/admin-subscription-price.component');
+var admin_list_user_component_1 = require('./pages/admin-list-user.component');
+var admin_add_user_component_1 = require('./pages/admin-add-user.component');
+var admin_unblock_user_component_1 = require('./pages/admin-unblock-user.component');
+var admin_user_group_component_1 = require('./pages/admin-user-group.component');
+var admin_usage_report_component_1 = require('./pages/admin-usage-report.component');
+var customer_summary_report_component_1 = require('./pages/customer-summary-report.component');
+var admin_expiring_subscription_report_component_1 = require('./pages/admin-expiring-subscription-report.component');
+var admin_new_subscription_report_component_1 = require('./pages/admin-new-subscription-report.component');
+var admin_subscription_cancellation_report_component_1 = require('./pages/admin-subscription-cancellation-report.component');
+var admin_net_ad_subscription_report_component_1 = require('./pages/admin-net-ad-subscription-report.component');
+var admin_site_license_usage_report_component_1 = require('./pages/admin-site-license-usage-report.component');
+var admin_discount_code_report_component_1 = require('./pages/admin-discount-code-report.component');
+var admin_image_export_report_component_1 = require('./pages/admin-image-export-report.component');
+var admin_add_building_level_account_component_1 = require('./pages/admin-add-building-level-account.component');
+var admin_add_building_level_account1_component_1 = require('./pages/admin-add-building-level-account1.component');
+var admin_view_update_profile_component_1 = require('./pages/admin-view-update-profile.component');
+var admin_manage_modesty_settings_component_1 = require('./pages/admin-manage-modesty-settings.component');
+var admin_manage_module_component_1 = require('./pages/admin-manage-module.component');
 var appRoutes = [
     { path: '', component: dashboard_component_1.DashboardComponent },
     { path: 'dashboard', redirectTo: '', pathMatch: 'full' },
     //{ path: 'login', component: LoginComponent },
     //{ path: 'login/:slug', component: LoginComponent }
-    { path: 'admin-update-profile', component: admin_update_profile_component_1.UpdateAdminProfileComponent }
+    { path: 'admin-update-profile', component: admin_update_profile_component_1.AdminUpdateProfileComponent },
+    { path: 'admin-change-password', component: admin_change_password_component_1.AdminChangePasswordComponent },
+    { path: 'admin-change-user-id', component: admin_change_user_id_component_1.AdminChangeUserIdComponent },
+    { path: 'admin-search-license', component: admin_search_license_component_1.AdminSearchLicenseComponent },
+    { path: 'admin-add-new-license', component: admin_add_new_license_component_1.AdminAddNewLicenseComponent },
+    { path: 'admin-setup-test-account', component: admin_setup_test_account_component_1.AdminSetupTestAccountComponent },
+    { path: 'admin-manage-discount-code', component: admin_manage_discount_code_component_1.AdminManageDiscountCodeComponent },
+    { path: 'admin-subscription-price', component: admin_subscription_price_component_1.AdminSubscriptionPriceComponent },
+    { path: 'admin-list-user', component: admin_list_user_component_1.AdminListUserComponent },
+    { path: 'admin-add-user', component: admin_add_user_component_1.AdminAddUserComponent },
+    { path: 'admin-unblock-user', component: admin_unblock_user_component_1.AdminUnblockUserComponent },
+    { path: 'admin-user-group', component: admin_user_group_component_1.AdminUserGroupComponent },
+    { path: 'admin-usage-report', component: admin_usage_report_component_1.AdminUsageReportComponent },
+    { path: 'customer-summary-report', component: customer_summary_report_component_1.CustomerSummaryReportComponent },
+    { path: 'admin-expiring-subscription-report', component: admin_expiring_subscription_report_component_1.AdminExpiringSubscriptionReportComponent },
+    { path: 'admin-new-subscription-report', component: admin_new_subscription_report_component_1.AdminNewSubscriptionReportComponent },
+    { path: 'admin-subscription-cancellation-report', component: admin_subscription_cancellation_report_component_1.AdminSubscriptionCancellationReportComponent },
+    { path: 'admin-net-ad-subscription-report', component: admin_net_ad_subscription_report_component_1.AdminNetAdSubscriptionReportComponent },
+    { path: 'admin-site-license-usage-report', component: admin_site_license_usage_report_component_1.AdminSiteLicenseUsageReportComponent },
+    { path: 'admin-discount-code-report', component: admin_discount_code_report_component_1.AdminDiscountCodeReportComponent },
+    { path: 'admin-image-export-report', component: admin_image_export_report_component_1.AdminImageExportReportComponent },
+    { path: 'admin-add-building-level-account', component: admin_add_building_level_account_component_1.AdminAddBuildingLevelAccountComponent },
+    { path: 'admin-add-building-level-account1', component: admin_add_building_level_account1_component_1.AdminAddBuildingLevelAccount1Component },
+    { path: 'admin-view-update-profile', component: admin_view_update_profile_component_1.AdminViewUpdateProfileComponent },
+    { path: 'admin-manage-modesty-settings', component: admin_manage_modesty_settings_component_1.AdminManageModestySettingsComponent },
+    { path: 'admin-manage-module', component: admin_manage_module_component_1.AdminManageModuleComponent }
 ];
 var AppModule = (function () {
     function AppModule() {
@@ -44,7 +94,32 @@ var AppModule = (function () {
                 dashboard_component_1.DashboardComponent,
                 //LoginComponent,
                 update_password_component_1.UpdatePasswordComponent,
-                admin_update_profile_component_1.UpdateAdminProfileComponent
+                admin_update_profile_component_1.AdminUpdateProfileComponent,
+                admin_change_password_component_1.AdminChangePasswordComponent,
+                admin_change_user_id_component_1.AdminChangeUserIdComponent,
+                admin_search_license_component_1.AdminSearchLicenseComponent,
+                admin_add_new_license_component_1.AdminAddNewLicenseComponent,
+                admin_setup_test_account_component_1.AdminSetupTestAccountComponent,
+                admin_manage_discount_code_component_1.AdminManageDiscountCodeComponent,
+                admin_subscription_price_component_1.AdminSubscriptionPriceComponent,
+                admin_list_user_component_1.AdminListUserComponent,
+                admin_add_user_component_1.AdminAddUserComponent,
+                admin_unblock_user_component_1.AdminUnblockUserComponent,
+                admin_user_group_component_1.AdminUserGroupComponent,
+                admin_usage_report_component_1.AdminUsageReportComponent,
+                customer_summary_report_component_1.CustomerSummaryReportComponent,
+                admin_expiring_subscription_report_component_1.AdminExpiringSubscriptionReportComponent,
+                admin_new_subscription_report_component_1.AdminNewSubscriptionReportComponent,
+                admin_subscription_cancellation_report_component_1.AdminSubscriptionCancellationReportComponent,
+                admin_net_ad_subscription_report_component_1.AdminNetAdSubscriptionReportComponent,
+                admin_site_license_usage_report_component_1.AdminSiteLicenseUsageReportComponent,
+                admin_discount_code_report_component_1.AdminDiscountCodeReportComponent,
+                admin_image_export_report_component_1.AdminImageExportReportComponent,
+                admin_add_building_level_account_component_1.AdminAddBuildingLevelAccountComponent,
+                admin_add_building_level_account1_component_1.AdminAddBuildingLevelAccount1Component,
+                admin_view_update_profile_component_1.AdminViewUpdateProfileComponent,
+                admin_manage_modesty_settings_component_1.AdminManageModestySettingsComponent,
+                admin_manage_module_component_1.AdminManageModuleComponent
             ],
             bootstrap: [app_component_1.AppComponent]
         }), 
diff --git a/400-SOURCECODE/AIAHTML5.Admin/app/app.module.js.map b/400-SOURCECODE/AIAHTML5.Admin/app/app.module.js.map
index e4f1da0..acdf59a 100644
--- a/400-SOURCECODE/AIAHTML5.Admin/app/app.module.js.map
+++ b/400-SOURCECODE/AIAHTML5.Admin/app/app.module.js.map
@@ -1 +1 @@
-{"version":3,"file":"app.module.js","sourceRoot":"","sources":["app.module.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"app.module.js","sourceRoot":"","sources":["app.module.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/400-SOURCECODE/AIAHTML5.Admin/app/app.module.ts b/400-SOURCECODE/AIAHTML5.Admin/app/app.module.ts
index b414fd7..13d6ca1 100644
--- a/400-SOURCECODE/AIAHTML5.Admin/app/app.module.ts
+++ b/400-SOURCECODE/AIAHTML5.Admin/app/app.module.ts
@@ -10,14 +10,79 @@ import {SiteFooterComponent} from './shared/site-footer.component';
 import {LoginComponent} from './pages/login.component';
 import {UpdatePasswordComponent} from './pages/update-password.component';
 import { DashboardComponent } from './pages/dashboard.component';
-import { UpdateAdminProfileComponent } from './pages/admin-update-profile.component';
+
+import { AdminUpdateProfileComponent } from './pages/admin-update-profile.component'; 
+import { AdminChangePasswordComponent } from './pages/admin-change-password.component';
+import { AdminChangeUserIdComponent } from './pages/admin-change-user-id.component';
+
+import { AdminSearchLicenseComponent } from './pages/admin-search-license.component';
+import { AdminAddNewLicenseComponent } from './pages/admin-add-new-license.component';
+import { AdminSetupTestAccountComponent } from './pages/admin-setup-test-account.component';
+
+import { AdminManageDiscountCodeComponent } from './pages/admin-manage-discount-code.component';
+import { AdminSubscriptionPriceComponent } from './pages/admin-subscription-price.component';
+
+import { AdminListUserComponent } from './pages/admin-list-user.component';
+import { AdminAddUserComponent } from './pages/admin-add-user.component';
+import { AdminUnblockUserComponent } from './pages/admin-unblock-user.component';
+import { AdminUserGroupComponent } from './pages/admin-user-group.component';
+
+import { AdminUsageReportComponent } from './pages/admin-usage-report.component';
+import { CustomerSummaryReportComponent } from './pages/customer-summary-report.component';
+import { AdminExpiringSubscriptionReportComponent } from './pages/admin-expiring-subscription-report.component';
+import { AdminNewSubscriptionReportComponent } from './pages/admin-new-subscription-report.component';
+import { AdminSubscriptionCancellationReportComponent } from './pages/admin-subscription-cancellation-report.component';
+import { AdminNetAdSubscriptionReportComponent } from './pages/admin-net-ad-subscription-report.component';
+import { AdminSiteLicenseUsageReportComponent } from './pages/admin-site-license-usage-report.component';
+import { AdminDiscountCodeReportComponent } from './pages/admin-discount-code-report.component';
+import { AdminImageExportReportComponent } from './pages/admin-image-export-report.component';
+
+import { AdminAddBuildingLevelAccountComponent } from './pages/admin-add-building-level-account.component';
+import { AdminAddBuildingLevelAccount1Component } from './pages/admin-add-building-level-account1.component';
+
+import { AdminViewUpdateProfileComponent } from './pages/admin-view-update-profile.component';
+import { AdminManageModestySettingsComponent } from './pages/admin-manage-modesty-settings.component';
+import { AdminManageModuleComponent } from './pages/admin-manage-module.component';
 
 const appRoutes: Routes = [
     { path: '', component: DashboardComponent },
     { path: 'dashboard', redirectTo: '', pathMatch: 'full' },
     //{ path: 'login', component: LoginComponent },
     //{ path: 'login/:slug', component: LoginComponent }
-    { path: 'admin-update-profile', component: UpdateAdminProfileComponent }
+    { path: 'admin-update-profile', component: AdminUpdateProfileComponent },
+    { path: 'admin-change-password', component: AdminChangePasswordComponent },
+    { path: 'admin-change-user-id', component: AdminChangeUserIdComponent },
+
+    { path: 'admin-search-license', component: AdminSearchLicenseComponent },
+    { path: 'admin-add-new-license', component: AdminAddNewLicenseComponent },
+    { path: 'admin-setup-test-account', component: AdminSetupTestAccountComponent },
+
+    { path: 'admin-manage-discount-code', component: AdminManageDiscountCodeComponent },
+    { path: 'admin-subscription-price', component: AdminSubscriptionPriceComponent },
+
+    { path: 'admin-list-user', component: AdminListUserComponent },
+    { path: 'admin-add-user', component: AdminAddUserComponent },
+    { path: 'admin-unblock-user', component: AdminUnblockUserComponent },
+    { path: 'admin-user-group', component: AdminUserGroupComponent },
+
+    { path: 'admin-usage-report', component: AdminUsageReportComponent },
+    { path: 'customer-summary-report', component: CustomerSummaryReportComponent },
+    { path: 'admin-expiring-subscription-report', component: AdminExpiringSubscriptionReportComponent },
+    { path: 'admin-new-subscription-report', component: AdminNewSubscriptionReportComponent },
+    { path: 'admin-subscription-cancellation-report', component: AdminSubscriptionCancellationReportComponent },
+    { path: 'admin-net-ad-subscription-report', component: AdminNetAdSubscriptionReportComponent },
+    { path: 'admin-site-license-usage-report', component: AdminSiteLicenseUsageReportComponent },
+    { path: 'admin-discount-code-report', component: AdminDiscountCodeReportComponent },
+    { path: 'admin-image-export-report', component: AdminImageExportReportComponent },
+
+
+    { path: 'admin-add-building-level-account', component: AdminAddBuildingLevelAccountComponent },
+    { path: 'admin-add-building-level-account1', component: AdminAddBuildingLevelAccount1Component },
+
+    { path: 'admin-view-update-profile', component: AdminViewUpdateProfileComponent },
+    { path: 'admin-manage-modesty-settings', component: AdminManageModestySettingsComponent },
+    { path: 'admin-manage-module', component: AdminManageModuleComponent }
+
 ];
 
 
@@ -35,7 +100,39 @@ const appRoutes: Routes = [
         DashboardComponent,
         //LoginComponent,
         UpdatePasswordComponent,
-        UpdateAdminProfileComponent
+
+        AdminUpdateProfileComponent,
+        AdminChangePasswordComponent,
+        AdminChangeUserIdComponent,
+
+        AdminSearchLicenseComponent,
+        AdminAddNewLicenseComponent,
+        AdminSetupTestAccountComponent,
+
+        AdminManageDiscountCodeComponent,
+        AdminSubscriptionPriceComponent,
+
+        AdminListUserComponent,
+        AdminAddUserComponent,
+        AdminUnblockUserComponent,
+        AdminUserGroupComponent,
+
+        AdminUsageReportComponent,
+        CustomerSummaryReportComponent,
+        AdminExpiringSubscriptionReportComponent,
+        AdminNewSubscriptionReportComponent,
+        AdminSubscriptionCancellationReportComponent,
+        AdminNetAdSubscriptionReportComponent,
+        AdminSiteLicenseUsageReportComponent,
+        AdminDiscountCodeReportComponent,
+        AdminImageExportReportComponent,
+
+        AdminAddBuildingLevelAccountComponent,
+        AdminAddBuildingLevelAccount1Component,
+
+        AdminViewUpdateProfileComponent,
+        AdminManageModestySettingsComponent,
+        AdminManageModuleComponent
         ],
     bootstrap:    [ AppComponent ]
 })
diff --git a/400-SOURCECODE/AIAHTML5.Admin/app/pages/admin-add-building-level-account.js b/400-SOURCECODE/AIAHTML5.Admin/app/pages/admin-add-building-level-account.js
deleted file mode 100644
index 1e4c282..0000000
--- a/400-SOURCECODE/AIAHTML5.Admin/app/pages/admin-add-building-level-account.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=admin-add-building-level-account.js.map
\ No newline at end of file
diff --git a/400-SOURCECODE/AIAHTML5.Admin/app/pages/admin-add-building-level-account.js.map b/400-SOURCECODE/AIAHTML5.Admin/app/pages/admin-add-building-level-account.js.map
deleted file mode 100644
index 685ce39..0000000
--- a/400-SOURCECODE/AIAHTML5.Admin/app/pages/admin-add-building-level-account.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"admin-add-building-level-account.js","sourceRoot":"","sources":["admin-add-building-level-account.ts"],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/400-SOURCECODE/AIAHTML5.Admin/app/pages/admin-add-building-level-account.ts b/400-SOURCECODE/AIAHTML5.Admin/app/pages/admin-add-building-level-account.ts
deleted file mode 100644
index 5f28270..0000000
--- a/400-SOURCECODE/AIAHTML5.Admin/app/pages/admin-add-building-level-account.ts
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/400-SOURCECODE/AIAHTML5.Admin/app/pages/admin-search-license.js b/400-SOURCECODE/AIAHTML5.Admin/app/pages/admin-search-license.js
deleted file mode 100644
index 4b1a9ce..0000000
--- a/400-SOURCECODE/AIAHTML5.Admin/app/pages/admin-search-license.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=admin-search-license.js.map
\ No newline at end of file
diff --git a/400-SOURCECODE/AIAHTML5.Admin/app/pages/admin-search-license.js.map b/400-SOURCECODE/AIAHTML5.Admin/app/pages/admin-search-license.js.map
deleted file mode 100644
index e82aba8..0000000
--- a/400-SOURCECODE/AIAHTML5.Admin/app/pages/admin-search-license.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"admin-search-license.js","sourceRoot":"","sources":["admin-search-license.ts"],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/400-SOURCECODE/AIAHTML5.Admin/app/pages/admin-search-license.ts b/400-SOURCECODE/AIAHTML5.Admin/app/pages/admin-search-license.ts
deleted file mode 100644
index 5f28270..0000000
--- a/400-SOURCECODE/AIAHTML5.Admin/app/pages/admin-search-license.ts
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/400-SOURCECODE/AIAHTML5.Admin/app/pages/admin-update-profile.component.js b/400-SOURCECODE/AIAHTML5.Admin/app/pages/admin-update-profile.component.js
index 5a8958f..c2cdb01 100644
--- a/400-SOURCECODE/AIAHTML5.Admin/app/pages/admin-update-profile.component.js
+++ b/400-SOURCECODE/AIAHTML5.Admin/app/pages/admin-update-profile.component.js
@@ -11,31 +11,31 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var core_1 = require('@angular/core');
 var router_1 = require('@angular/router');
 var application_service_1 = require('../services/application.service');
-var UpdateAdminProfileComponent = (function () {
-    function UpdateAdminProfileComponent(application, router) {
+var AdminUpdateProfileComponent = (function () {
+    function AdminUpdateProfileComponent(application, router) {
         this.application = application;
         this.router = router;
     }
-    UpdateAdminProfileComponent.prototype.ngAfterViewInit = function () {
+    AdminUpdateProfileComponent.prototype.ngAfterViewInit = function () {
         this.initializeUIElements();
     };
-    UpdateAdminProfileComponent.prototype.initializeUIElements = function () {
+    AdminUpdateProfileComponent.prototype.initializeUIElements = function () {
     };
-    UpdateAdminProfileComponent.prototype.ngOnInit = function () {
+    AdminUpdateProfileComponent.prototype.ngOnInit = function () {
         /*if (this.application.currentUser == null) {
             this.router.navigate(['/login']);
         }*/
     };
-    UpdateAdminProfileComponent.prototype.showAlert = function (id) {
+    AdminUpdateProfileComponent.prototype.showAlert = function (id) {
         jQuery('#' + id).modal('show');
     };
-    UpdateAdminProfileComponent = __decorate([
+    AdminUpdateProfileComponent = __decorate([
         core_1.Component({
             templateUrl: './app/pages/admin-update-profile.component.html'
         }), 
         __metadata('design:paramtypes', [application_service_1.ApplicationService, router_1.Router])
-    ], UpdateAdminProfileComponent);
-    return UpdateAdminProfileComponent;
+    ], AdminUpdateProfileComponent);
+    return AdminUpdateProfileComponent;
 }());
-exports.UpdateAdminProfileComponent = UpdateAdminProfileComponent;
+exports.AdminUpdateProfileComponent = AdminUpdateProfileComponent;
 //# sourceMappingURL=admin-update-profile.component.js.map
\ No newline at end of file
diff --git a/400-SOURCECODE/AIAHTML5.Admin/app/pages/admin-update-profile.component.ts b/400-SOURCECODE/AIAHTML5.Admin/app/pages/admin-update-profile.component.ts
index 1333809..1f82e97 100644
--- a/400-SOURCECODE/AIAHTML5.Admin/app/pages/admin-update-profile.component.ts
+++ b/400-SOURCECODE/AIAHTML5.Admin/app/pages/admin-update-profile.component.ts
@@ -7,7 +7,7 @@ declare var jQuery: any;
 @Component({
     templateUrl: './app/pages/admin-update-profile.component.html'
 })
-export class UpdateAdminProfileComponent implements AfterViewInit, OnInit {
+export class AdminUpdateProfileComponent implements AfterViewInit, OnInit {
 
 
     constructor(private application: ApplicationService, private router: Router) {
diff --git a/400-SOURCECODE/AIAHTML5.Admin/app/shared/site-menu.component.js b/400-SOURCECODE/AIAHTML5.Admin/app/shared/site-menu.component.js
index 71272fd..bee28e6 100644
--- a/400-SOURCECODE/AIAHTML5.Admin/app/shared/site-menu.component.js
+++ b/400-SOURCECODE/AIAHTML5.Admin/app/shared/site-menu.component.js
@@ -62,40 +62,7 @@ var SiteMenuComponent = (function () {
     SiteMenuComponent = __decorate([
         core_1.Component({
             selector: 'site-menu',
-            //template: `
-            //    <div class="ui attached stackable menu">
-            //        <div class="ui container" *ngIf="application.appSettings != null">
-            //            <a class="item" *ngFor="let menuItem of application.getMenuItemsWithNoChildren(application.appSettings.menu.menuItems)" [routerLink]="menuItem.slug"><i class="{{menuItem.icon}} icon"></i>{{menuItem.name}}</a>
-            //            <div class="ui simple dropdown item" *ngFor="let menuItem of application.getMenuItemsWithChildren(application.appSettings.menu.menuItems)">
-            //                {{menuItem.name}}
-            //                <i class="dropdown icon"></i>
-            //                <div class="menu">
-            //                    <a class="item" *ngFor="let childMenuItem of application.getMenuItemsWithNoChildren(menuItem.menuItems)" [routerLink]="childMenuItem.slug"><i class="{{childMenuItem.icon}} icon"></i> {{childMenuItem.name}}</a>
-            //                    <div class="ui simple dropdown item" *ngFor="let childMenuItem of application.getMenuItemsWithChildren(menuItem.menuItems)">
-            //                        <i class="{{childMenuItem.icon}} icon"></i> 
-            //                        {{childMenuItem.name}}
-            //                        <div class="menu">
-            //                            <a class="item" *ngFor="let nestedChildMenuItem of application.getMenuItemsWithNoChildren(childMenuItem.menuItems)" [routerLink]="nestedChildMenuItem.slug"><i class="{{nestedChildMenuItem.icon}} icon"></i> {{nestedChildMenuItem.name}}</a>
-            //                        </div>
-            //                    </div>
-            //                </div>
-            //            </div>
-            //            <div class="item">
-            //                <div class="ui search">
-            //                    <div class="ui icon input">
-            //                        <input class="prompt" placeholder="Customer Mobile or Email..." type="text">
-            //                        <i class="search icon"></i>
-            //                    </div>
-            //                    <div class="results"></div>
-            //                </div>
-            //            </div>
-            //            <div class="right item" *ngIf="application.currentUser != null">
-            //                <i class="sign out icon"></i> <a (click)="application.logout()">Sign Out</a>
-            //            </div>
-            //        </div>
-            //    </div>
-            //`
-            template: "\n<nav class=\"navbar navbar-inverse navbar-fixed-top\">\n        <div class=\"container-fluid\">\n            <div class=\"navbar-header\">\n\n                <a class=\"navbar-brand\" href=\"#\"><img src=\"app/assets/img/logo-main.png\" class=\"img-responsive\" alt=\"\"></a>\n                <div class=\"\">\n                    <div class=\"btn-group pull-right\">\n                        <ul class=\"nav navbar-nav navbar-right visible-sm visible-md\">\n                            <li class=\"marginR5\" data-toggle=\"tooltip\" data-placement=\"top\" title=\"Logout\"><a href=\"login.html\"><i class=\"fa fa-power-off\"></i></a></li>\n                        </ul>\n                    </div>\n                    <div class=\"btn-group pull-right mar-top17 visible-sm visible-md\">\n                        <button type=\"button\" class=\"btn btn-primary dropdown-toggle \" data-toggle=\"dropdown\" aria-haspopup=\"true\" aria-expanded=\"false\">\n                            Welcome Maribel Brogden <span class=\"caret\"></span>\n                        </button>\n                        <ul class=\"dropdown-menu\">\n                            <li><a href=\"#\"><strong>Date:</strong> 11/21/2016</a></li>\n                        </ul>\n                    </div>\n                </div>\n                <button type=\"button\" class=\"navbar-toggle collapsed mar-top17\" data-toggle=\"collapse\" data-target=\"#navbar\" aria-expanded=\"false\" aria-controls=\"navbar\">\n                    <span class=\"sr-only\">Toggle navigation</span>\n                    <span class=\"icon-bar\"></span>\n                    <span class=\"icon-bar\"></span>\n                    <span class=\"icon-bar\"></span>\n                </button>\n            </div>\n\n            <div id=\"navbar\" class=\"navbar-collapse collapse\">\n                <ul class=\"nav navbar-nav toperMenu-spaceleft\">\n                    <li class=\"dropdown\">\n                        <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\" role=\"button\" aria-haspopup=\"true\" aria-expanded=\"false\">Profile<span class=\"caret\"></span></a>\n                        <ul class=\"dropdown-menu\">\n                            <li><a [routeLink]=['/app/pages/admin-update-profile.component.html'] >Update Profile</a></li>\n                            <li><a href=\"admin-change-password.html\">Change Password</a></li>\n                            <li><a href=\"admin-change-user-id.html\">Change User ID</a></li>\n                        </ul>\n                    </li>\n                    <li class=\"dropdown\">\n                        <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\" role=\"button\" aria-haspopup=\"true\" aria-expanded=\"false\">Licenses<span class=\"caret\"></span></a>\n                        <ul class=\"dropdown-menu\">\n                            <li><a href=\"admin-search-license.html\">Search License</a></li>\n                            <li><a href=\"admin-add-new-license.html\">Add New License</a></li>\n                            <li><a href=\"admin-setup-test-account.html\">Setup Test Account</a></li>\n                        </ul>\n                    </li>\n                    <li class=\"dropdown\">\n                        <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\" role=\"button\" aria-haspopup=\"true\" aria-expanded=\"false\">Product Features<span class=\"caret\"></span></a>\n                        <ul class=\"dropdown-menu\">\n                            <li><a href=\"admin-manage-discount-code.html\">Manage Discount Code</a></li>\n                            <li><a href=\"admin-subscription-price.html\">Subscription Price</a></li>\n                        </ul>\n                    </li>\n                    <li class=\"dropdown\">\n                        <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\" role=\"button\" aria-haspopup=\"true\" aria-expanded=\"false\">Users<span class=\"caret\"></span></a>\n                        <ul class=\"dropdown-menu\">\n                            <li><a href=\"admin-list-user.html\">List User</a></li>\n                            <li><a href=\"admin-add-user.html\">Add User</a></li>\n                            <li><a href=\"admin-Unblock-user.html\">Unblock User</a></li>\n                            <li><a href=\"admin-user-group.html\">User Group</a></li>\n                        </ul>\n                    </li>\n                    <li class=\"dropdown\">\n                        <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\" role=\"button\" aria-haspopup=\"true\" aria-expanded=\"false\">Reports<span class=\"caret\"></span></a>\n                        <ul class=\"dropdown-menu\">\n                            <li><a href=\"admin-usage-report.html\">Usage Report</a></li>\n                            <li><a href=\"customer-summary-report.html\">Customer Summary Report</a></li>\n                            <li><a href=\"admin-expiring-subscription-report.html\">Expiring Subscription Report</a></li>\n                            <li><a href=\"admin-new-subscription-report.html\">New Subscription Report</a></li>\n                            <li><a href=\"admin-subscription-cancellation-report.html\">Subscription Cancellation Report</a></li>\n                            <li><a href=\"admin-net-ad-subscription-report.html\">Net AD Subscription Report</a></li>\n                            <li><a href=\"admin-site-license-usage-report.html\">Site License Usage Report</a></li>\n                            <li><a href=\"admin-discount-code-report.html\">Discount Code Report</a></li>\n                            <li><a href=\"admin-image-export-report.html\">Image Export Report</a></li>\n                        </ul>\n                    </li>\n                    <li class=\"dropdown\">\n                        <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\" role=\"button\" aria-haspopup=\"true\" aria-expanded=\"false\">Site Account<span class=\"caret\"></span></a>\n                        <ul class=\"dropdown-menu\">\n                            <li><a href=\"admin-add-building-level-account.html\">Add Building Level Account</a></li>\n                        </ul>\n                    </li>\n                    <li class=\"dropdown\">\n                        <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\" role=\"button\" aria-haspopup=\"true\" aria-expanded=\"false\">Profile<span class=\"caret\"></span></a>\n                        <ul class=\"dropdown-menu\">\n                            <li><a href=\"admin-view-update-profile.html\">View/Update Profile</a></li>\n                            <li><a href=\"admin-manage-modesty-settings.html\">Manage Modesty Settings</a></li>\n                            <li><a href=\"admin-manage-module.html\">Manage Module</a></li>\n                        </ul>\n                    </li>\n                    <li><a href=\"#\">Product</a></li>\n                </ul>\n                <!--logout-->\n                <div class=\"wel-brog\">\n                    <div class=\"btn-group pull-right mob1\">\n                        <ul class=\"nav navbar-nav navbar-right hidden-sm\">\n                            <li class=\"marginR5\" data-toggle=\"tooltip\" data-placement=\"top\" title=\"Logout\"><a href=\"login.html\"><i class=\"fa fa-power-off\"></i></a></li>\n                        </ul>\n                    </div>\n                    <div class=\"btn-group pull-right hidden-sm mar-top17 mob2\">\n                        <button type=\"button\" class=\"btn btn-primary dropdown-toggle btn-sm\" data-toggle=\"dropdown\" aria-haspopup=\"true\" aria-expanded=\"false\">\n                            Welcome Maribel Brogden <span class=\"caret\"></span>\n                        </button>\n                        <ul class=\"dropdown-menu\">\n                            <li><a href=\"#\"><strong>Date:</strong> 05/08/2017</a></li>\n                        </ul>\n                    </div>\n                </div>\n                <!--logout-->\n            </div>\n        </div>\n    </nav>\n"
+            template: "\n<nav class=\"navbar navbar-inverse navbar-fixed-top\">\n        <div class=\"container-fluid\">\n            <div class=\"navbar-header\">\n\n                <a class=\"navbar-brand\" href=\"#\"><img src=\"app/assets/img/logo-main.png\" class=\"img-responsive\" alt=\"\"></a>\n                <div class=\"\">\n                    <div class=\"btn-group pull-right\">\n                        <ul class=\"nav navbar-nav navbar-right visible-sm visible-md\">\n                            <li class=\"marginR5\" data-toggle=\"tooltip\" data-placement=\"top\" title=\"Logout\"><a href=\"login.html\"><i class=\"fa fa-power-off\"></i></a></li>\n                        </ul>\n                    </div>\n                    <div class=\"btn-group pull-right mar-top17 visible-sm visible-md\">\n                        <button type=\"button\" class=\"btn btn-primary dropdown-toggle \" data-toggle=\"dropdown\" aria-haspopup=\"true\" aria-expanded=\"false\">\n                            Welcome Maribel Brogden <span class=\"caret\"></span>\n                        </button>\n                        <ul class=\"dropdown-menu\">\n                            <li><a href=\"#\"><strong>Date:</strong> 11/21/2016</a></li>\n                        </ul>\n                    </div>\n                </div>\n                <button type=\"button\" class=\"navbar-toggle collapsed mar-top17\" data-toggle=\"collapse\" data-target=\"#navbar\" aria-expanded=\"false\" aria-controls=\"navbar\">\n                    <span class=\"sr-only\">Toggle navigation</span>\n                    <span class=\"icon-bar\"></span>\n                    <span class=\"icon-bar\"></span>\n                    <span class=\"icon-bar\"></span>\n                </button>\n            </div>\n\n            <div id=\"navbar\" class=\"navbar-collapse collapse\">\n                <ul class=\"nav navbar-nav toperMenu-spaceleft\">\n                    <li class=\"dropdown\">\n                        <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\" role=\"button\" aria-haspopup=\"true\" aria-expanded=\"false\">Profile<span class=\"caret\"></span></a>\n                        <ul class=\"dropdown-menu\">\n                            <li><a routerLink=\"admin-update-profile\" routerLinkActive=\"active\">Update Profile</a></li>\n                            <li><a routerLink=\"admin-change-password\" routerLinkActive=\"active\">Change Password</a></li>\n                            <li><a routerLink=\"admin-change-user-id\" routerLinkActive=\"active\">Change User ID</a></li>\n                        </ul>\n                    </li>\n                    <li class=\"dropdown\">\n                        <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\" role=\"button\" aria-haspopup=\"true\" aria-expanded=\"false\">Licenses<span class=\"caret\"></span></a>\n                        <ul class=\"dropdown-menu\">\n                            <li><a routerLink=\"admin-search-license\" routerLinkActive=\"active\">Search License</a></li>\n                            <li><a routerLink=\"admin-add-new-license\" routerLinkActive=\"active\">Add New License</a></li>\n                            <li><a routerLink=\"admin-setup-test-account\" routerLinkActive=\"active\">Setup Test Account</a></li>\n                        </ul>\n                    </li>\n                    <li class=\"dropdown\">\n                        <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\" role=\"button\" aria-haspopup=\"true\" aria-expanded=\"false\">Product Features<span class=\"caret\"></span></a>\n                        <ul class=\"dropdown-menu\">\n                            <li><a routerLink=\"admin-manage-discount-code\" routerLinkActive=\"active\">Manage Discount Code</a></li>\n                            <li><a routerLink=\"admin-subscription-price\" routerLinkActive=\"active\">Subscription Price</a></li>\n                        </ul>\n                    </li>\n                    <li class=\"dropdown\">\n                        <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\" role=\"button\" aria-haspopup=\"true\" aria-expanded=\"false\">Users<span class=\"caret\"></span></a>\n                        <ul class=\"dropdown-menu\">\n                            <li><a routerLink=\"admin-list-user\" routerLinkActive=\"active\">List User</a></li>\n                            <li><a routerLink=\"admin-add-user\" routerLinkActive=\"active\">Add User</a></li>\n                            <li><a routerLink=\"admin-unblock-user\" routerLinkActive=\"active\">Unblock User</a></li>\n                            <li><a routerLink=\"admin-user-group\" routerLinkActive=\"active\">User Group</a></li>\n                        </ul>\n                    </li>\n                    <li class=\"dropdown\">\n                        <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\" role=\"button\" aria-haspopup=\"true\" aria-expanded=\"false\">Reports<span class=\"caret\"></span></a>\n                        <ul class=\"dropdown-menu\">\n                            <li><a routerLink=\"admin-usage-report\" routerLinkActive=\"active\">Usage Report</a></li>\n                            <li><a routerLink=\"customer-summary-report\" routerLinkActive=\"active\">Customer Summary Report</a></li>\n                            <li><a routerLink=\"admin-expiring-subscription-report\" routerLinkActive=\"active\">Expiring Subscription Report</a></li>\n                            <li><a routerLink=\"admin-new-subscription-report\" routerLinkActive=\"active\">New Subscription Report</a></li>\n                            <li><a routerLink=\"admin-subscription-cancellation-report\" routerLinkActive=\"active\">Subscription Cancellation Report</a></li>\n                            <li><a routerLink=\"admin-net-ad-subscription-report\" routerLinkActive=\"active\">Net AD Subscription Report</a></li>\n                            <li><a routerLink=\"admin-site-license-usage-report\" routerLinkActive=\"active\">Site License Usage Report</a></li>\n                            <li><a routerLink=\"admin-discount-code-report\" routerLinkActive=\"active\">Discount Code Report</a></li>\n                            <li><a routerLink=\"admin-image-export-report\" routerLinkActive=\"active\">Image Export Report</a></li>\n                        </ul>\n                    </li>\n                    <li class=\"dropdown\">\n                        <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\" role=\"button\" aria-haspopup=\"true\" aria-expanded=\"false\">Site Account<span class=\"caret\"></span></a>\n                        <ul class=\"dropdown-menu\">\n                            <li><a routerLink=\"admin-add-building-level-account\" routerLinkActive=\"active\">Add Building Level Account</a></li>\n                        </ul>\n                    </li>\n                    <li class=\"dropdown\">\n                        <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\" role=\"button\" aria-haspopup=\"true\" aria-expanded=\"false\">Profile<span class=\"caret\"></span></a>\n                        <ul class=\"dropdown-menu\">\n                            <li><a routerLink=\"admin-view-update-profile\" >View/Update Profile</a></li>\n                            <li><a routerLink=\"admin-manage-modesty-settings\" >Manage Modesty Settings</a></li>\n                            <li><a routerLink=\"admin-manage-module\" >Manage Module</a></li>\n                        </ul>\n                    </li>\n                    <li><a href=\"#\">Product</a></li>\n                </ul>\n                <!--logout-->\n                <div class=\"wel-brog\">\n                    <div class=\"btn-group pull-right mob1\">\n                        <ul class=\"nav navbar-nav navbar-right hidden-sm\">\n                            <li class=\"marginR5\" data-toggle=\"tooltip\" data-placement=\"top\" title=\"Logout\"><a href=\"login.html\"><i class=\"fa fa-power-off\"></i></a></li>\n                        </ul>\n                    </div>\n                    <div class=\"btn-group pull-right hidden-sm mar-top17 mob2\">\n                        <button type=\"button\" class=\"btn btn-primary dropdown-toggle btn-sm\" data-toggle=\"dropdown\" aria-haspopup=\"true\" aria-expanded=\"false\">\n                            Welcome Maribel Brogden <span class=\"caret\"></span>\n                        </button>\n                        <ul class=\"dropdown-menu\">\n                            <li><a href=\"#\"><strong>Date:</strong> 05/08/2017</a></li>\n                        </ul>\n                    </div>\n                </div>\n                <!--logout-->\n            </div>\n        </div>\n    </nav>\n"
         }), 
         __metadata('design:paramtypes', [application_service_1.ApplicationService, router_1.Router])
     ], SiteMenuComponent);
diff --git a/400-SOURCECODE/AIAHTML5.Admin/app/shared/site-menu.component.js.map b/400-SOURCECODE/AIAHTML5.Admin/app/shared/site-menu.component.js.map
index d5f9c82..398de6f 100644
--- a/400-SOURCECODE/AIAHTML5.Admin/app/shared/site-menu.component.js.map
+++ b/400-SOURCECODE/AIAHTML5.Admin/app/shared/site-menu.component.js.map
@@ -1 +1 @@
-{"version":3,"file":"site-menu.component.js","sourceRoot":"","sources":["site-menu.component.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,qBAAwD,eAAe,CAAC,CAAA;AACxE,oCAAmC,iCAAiC,CAAC,CAAA;AACrE,uBAAuB,iBAAiB,CAAC,CAAA;AA2JzC;IAQI,2BAAmB,WAA+B,EAAU,MAAc;QAAvD,gBAAW,GAAX,WAAW,CAAoB;QAAU,WAAM,GAAN,MAAM,CAAQ;QAL1E,SAAI,GAAW,OAAO,CAAC;QAGvB,WAAM,GAAY,IAAI,CAAC;IAEuD,CAAC;IAE/E,uCAAW,GAAX;QACI,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC;YACZ,MAAM,CAAC,QAAQ,CAAC;QACpB,IAAI;YACA,EAAE,CAAC;IACX,CAAC;IAED,2CAAe,GAAf;QAAA,iBAEC;QADG,UAAU,CAAC,cAAM,OAAA,KAAI,CAAC,aAAa,EAAE,EAApB,CAAoB,EAAE,IAAI,CAAC,CAAC;IACjD,CAAC;IAED,6CAAiB,GAAjB,UAAkB,QAAa;QAC3B,EAAE,CAAC,CAAC,QAAQ,CAAC,IAAI,IAAI,IAAI,CAAC;YACtB,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC;QACzB,IAAI;YACA,MAAM,CAAC,kBAAkB,GAAG,QAAQ,CAAC,IAAI,GAAG,aAAa,CAAC;IAClE,CAAC;IAED,sCAAU,GAAV,UAAW,KAAa;QACpB,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC;YACX,MAAM,CAAC,QAAQ,CAAC;QACpB,IAAI;YACA,MAAM,CAAC,EAAE,CAAC;IAClB,CAAC;IAED,yCAAa,GAAb;QACI,EAAE,CAAC,CAAC,MAAM,IAAI,IAAI,CAAC,CAAC,CAAC;YACjB,MAAM,CAAC,aAAa,CAAC;iBAChB,OAAO,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC;YAE3C,MAAM,CAAC,cAAc,CAAC;iBACjB,QAAQ,EAAE,CAAC;QACpB,CAAC;IACL,CAAC;IAED,yCAAa,GAAb,UAAc,GAAW;QACrB,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IAChC,CAAC;IA7CD;QAAC,YAAK,CAAC,MAAM,CAAC;;mDAAA;IAGd;QAAC,YAAK,CAAC,QAAQ,CAAC;;qDAAA;IA5JpB;QAAC,gBAAS,CAAC;YACP,QAAQ,EAAE,WAAW;YACrB,aAAa;YACb,8CAA8C;YAC9C,4EAA4E;YAC5E,8NAA8N;YAE9N,yJAAyJ;YACzJ,mCAAmC;YACnC,+CAA+C;YAC/C,oCAAoC;YACpC,uOAAuO;YACvO,kJAAkJ;YAClJ,sEAAsE;YACtE,gDAAgD;YAChD,4CAA4C;YAC5C,4QAA4Q;YAC5Q,gCAAgC;YAChC,4BAA4B;YAC5B,wBAAwB;YACxB,oBAAoB;YACpB,gCAAgC;YAChC,yCAAyC;YACzC,iDAAiD;YACjD,sGAAsG;YACtG,qDAAqD;YACrD,4BAA4B;YAC5B,iDAAiD;YACjD,wBAAwB;YACxB,oBAAoB;YACpB,8EAA8E;YAC9E,8FAA8F;YAC9F,oBAAoB;YACpB,gBAAgB;YAChB,YAAY;YACZ,GAAG;YACH,QAAQ,EAAE,ogQAiHb;SACA,CAAC;;yBAAA;IAkDF,wBAAC;AAAD,CAAC,AAjDD,IAiDC;AAjDY,yBAAiB,oBAiD7B,CAAA"}
\ No newline at end of file
+{"version":3,"file":"site-menu.component.js","sourceRoot":"","sources":["site-menu.component.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,qBAAwD,eAAe,CAAC,CAAA;AACxE,oCAAmC,iCAAiC,CAAC,CAAA;AACrE,uBAAuB,iBAAiB,CAAC,CAAA;AAyHzC;IAQI,2BAAmB,WAA+B,EAAU,MAAc;QAAvD,gBAAW,GAAX,WAAW,CAAoB;QAAU,WAAM,GAAN,MAAM,CAAQ;QAL1E,SAAI,GAAW,OAAO,CAAC;QAGvB,WAAM,GAAY,IAAI,CAAC;IAEuD,CAAC;IAE/E,uCAAW,GAAX;QACI,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC;YACZ,MAAM,CAAC,QAAQ,CAAC;QACpB,IAAI;YACA,EAAE,CAAC;IACX,CAAC;IAED,2CAAe,GAAf;QAAA,iBAEC;QADG,UAAU,CAAC,cAAM,OAAA,KAAI,CAAC,aAAa,EAAE,EAApB,CAAoB,EAAE,IAAI,CAAC,CAAC;IACjD,CAAC;IAED,6CAAiB,GAAjB,UAAkB,QAAa;QAC3B,EAAE,CAAC,CAAC,QAAQ,CAAC,IAAI,IAAI,IAAI,CAAC;YACtB,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC;QACzB,IAAI;YACA,MAAM,CAAC,kBAAkB,GAAG,QAAQ,CAAC,IAAI,GAAG,aAAa,CAAC;IAClE,CAAC;IAED,sCAAU,GAAV,UAAW,KAAa;QACpB,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC;YACX,MAAM,CAAC,QAAQ,CAAC;QACpB,IAAI;YACA,MAAM,CAAC,EAAE,CAAC;IAClB,CAAC;IAED,yCAAa,GAAb;QACI,EAAE,CAAC,CAAC,MAAM,IAAI,IAAI,CAAC,CAAC,CAAC;YACjB,MAAM,CAAC,aAAa,CAAC;iBAChB,OAAO,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC;YAE3C,MAAM,CAAC,cAAc,CAAC;iBACjB,QAAQ,EAAE,CAAC;QACpB,CAAC;IACL,CAAC;IAED,yCAAa,GAAb,UAAc,GAAW;QACrB,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IAChC,CAAC;IA7CD;QAAC,YAAK,CAAC,MAAM,CAAC;;mDAAA;IAGd;QAAC,YAAK,CAAC,QAAQ,CAAC;;qDAAA;IA1HpB;QAAC,gBAAS,CAAC;YACP,QAAQ,EAAE,WAAW;YACrB,QAAQ,EAAE,2mRAiHb;SACA,CAAC;;yBAAA;IAkDF,wBAAC;AAAD,CAAC,AAjDD,IAiDC;AAjDY,yBAAiB,oBAiD7B,CAAA"}
\ No newline at end of file
diff --git a/400-SOURCECODE/AIAHTML5.Admin/app/shared/site-menu.component.ts b/400-SOURCECODE/AIAHTML5.Admin/app/shared/site-menu.component.ts
index e9aa105..827d572 100644
--- a/400-SOURCECODE/AIAHTML5.Admin/app/shared/site-menu.component.ts
+++ b/400-SOURCECODE/AIAHTML5.Admin/app/shared/site-menu.component.ts
@@ -1,207 +1,173 @@
-import { Component, AfterViewInit, Input, OnInit } from '@angular/core';
-import { ApplicationService } from '../services/application.service';
-import { Router } from '@angular/router';
-
-declare var jQuery: any;
-
-@Component({
-    selector: 'site-menu',
-    //template: `
-    //    <div class="ui attached stackable menu">
-    //        <div class="ui container" *ngIf="application.appSettings != null">
-    //            <a class="item" *ngFor="let menuItem of application.getMenuItemsWithNoChildren(application.appSettings.menu.menuItems)" [routerLink]="menuItem.slug"><i class="{{menuItem.icon}} icon"></i>{{menuItem.name}}</a>
-
-    //            <div class="ui simple dropdown item" *ngFor="let menuItem of application.getMenuItemsWithChildren(application.appSettings.menu.menuItems)">
-    //                {{menuItem.name}}
-    //                <i class="dropdown icon"></i>
-    //                <div class="menu">
-    //                    <a class="item" *ngFor="let childMenuItem of application.getMenuItemsWithNoChildren(menuItem.menuItems)" [routerLink]="childMenuItem.slug"><i class="{{childMenuItem.icon}} icon"></i> {{childMenuItem.name}}</a>
-    //                    <div class="ui simple dropdown item" *ngFor="let childMenuItem of application.getMenuItemsWithChildren(menuItem.menuItems)">
-    //                        <i class="{{childMenuItem.icon}} icon"></i> 
-    //                        {{childMenuItem.name}}
-    //                        <div class="menu">
-    //                            <a class="item" *ngFor="let nestedChildMenuItem of application.getMenuItemsWithNoChildren(childMenuItem.menuItems)" [routerLink]="nestedChildMenuItem.slug"><i class="{{nestedChildMenuItem.icon}} icon"></i> {{nestedChildMenuItem.name}}</a>
-    //                        </div>
-    //                    </div>
-    //                </div>
-    //            </div>
-    //            <div class="item">
-    //                <div class="ui search">
-    //                    <div class="ui icon input">
-    //                        <input class="prompt" placeholder="Customer Mobile or Email..." type="text">
-    //                        <i class="search icon"></i>
-    //                    </div>
-    //                    <div class="results"></div>
-    //                </div>
-    //            </div>
-    //            <div class="right item" *ngIf="application.currentUser != null">
-    //                <i class="sign out icon"></i> <a (click)="application.logout()">Sign Out</a>
-    //            </div>
-    //        </div>
-    //    </div>
-    //`
-    template: `
-<nav class="navbar navbar-inverse navbar-fixed-top">
-        <div class="container-fluid">
-            <div class="navbar-header">
-
-                <a class="navbar-brand" href="#"><img src="app/assets/img/logo-main.png" class="img-responsive" alt=""></a>
-                <div class="">
-                    <div class="btn-group pull-right">
-                        <ul class="nav navbar-nav navbar-right visible-sm visible-md">
-                            <li class="marginR5" data-toggle="tooltip" data-placement="top" title="Logout"><a href="login.html"><i class="fa fa-power-off"></i></a></li>
-                        </ul>
-                    </div>
-                    <div class="btn-group pull-right mar-top17 visible-sm visible-md">
-                        <button type="button" class="btn btn-primary dropdown-toggle " data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                            Welcome Maribel Brogden <span class="caret"></span>
-                        </button>
-                        <ul class="dropdown-menu">
-                            <li><a href="#"><strong>Date:</strong> 11/21/2016</a></li>
-                        </ul>
-                    </div>
-                </div>
-                <button type="button" class="navbar-toggle collapsed mar-top17" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
-                    <span class="sr-only">Toggle navigation</span>
-                    <span class="icon-bar"></span>
-                    <span class="icon-bar"></span>
-                    <span class="icon-bar"></span>
-                </button>
-            </div>
-
-            <div id="navbar" class="navbar-collapse collapse">
-                <ul class="nav navbar-nav toperMenu-spaceleft">
-                    <li class="dropdown">
-                        <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Profile<span class="caret"></span></a>
-                        <ul class="dropdown-menu">
-                            <li><a [routeLink]=['/app/pages/admin-update-profile.component.html'] >Update Profile</a></li>
-                            <li><a href="admin-change-password.html">Change Password</a></li>
-                            <li><a href="admin-change-user-id.html">Change User ID</a></li>
-                        </ul>
-                    </li>
-                    <li class="dropdown">
-                        <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Licenses<span class="caret"></span></a>
-                        <ul class="dropdown-menu">
-                            <li><a href="admin-search-license.html">Search License</a></li>
-                            <li><a href="admin-add-new-license.html">Add New License</a></li>
-                            <li><a href="admin-setup-test-account.html">Setup Test Account</a></li>
-                        </ul>
-                    </li>
-                    <li class="dropdown">
-                        <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Product Features<span class="caret"></span></a>
-                        <ul class="dropdown-menu">
-                            <li><a href="admin-manage-discount-code.html">Manage Discount Code</a></li>
-                            <li><a href="admin-subscription-price.html">Subscription Price</a></li>
-                        </ul>
-                    </li>
-                    <li class="dropdown">
-                        <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Users<span class="caret"></span></a>
-                        <ul class="dropdown-menu">
-                            <li><a href="admin-list-user.html">List User</a></li>
-                            <li><a href="admin-add-user.html">Add User</a></li>
-                            <li><a href="admin-Unblock-user.html">Unblock User</a></li>
-                            <li><a href="admin-user-group.html">User Group</a></li>
-                        </ul>
-                    </li>
-                    <li class="dropdown">
-                        <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Reports<span class="caret"></span></a>
-                        <ul class="dropdown-menu">
-                            <li><a href="admin-usage-report.html">Usage Report</a></li>
-                            <li><a href="customer-summary-report.html">Customer Summary Report</a></li>
-                            <li><a href="admin-expiring-subscription-report.html">Expiring Subscription Report</a></li>
-                            <li><a href="admin-new-subscription-report.html">New Subscription Report</a></li>
-                            <li><a href="admin-subscription-cancellation-report.html">Subscription Cancellation Report</a></li>
-                            <li><a href="admin-net-ad-subscription-report.html">Net AD Subscription Report</a></li>
-                            <li><a href="admin-site-license-usage-report.html">Site License Usage Report</a></li>
-                            <li><a href="admin-discount-code-report.html">Discount Code Report</a></li>
-                            <li><a href="admin-image-export-report.html">Image Export Report</a></li>
-                        </ul>
-                    </li>
-                    <li class="dropdown">
-                        <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Site Account<span class="caret"></span></a>
-                        <ul class="dropdown-menu">
-                            <li><a href="admin-add-building-level-account.html">Add Building Level Account</a></li>
-                        </ul>
-                    </li>
-                    <li class="dropdown">
-                        <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Profile<span class="caret"></span></a>
-                        <ul class="dropdown-menu">
-                            <li><a href="admin-view-update-profile.html">View/Update Profile</a></li>
-                            <li><a href="admin-manage-modesty-settings.html">Manage Modesty Settings</a></li>
-                            <li><a href="admin-manage-module.html">Manage Module</a></li>
-                        </ul>
-                    </li>
-                    <li><a href="#">Product</a></li>
-                </ul>
-                <!--logout-->
-                <div class="wel-brog">
-                    <div class="btn-group pull-right mob1">
-                        <ul class="nav navbar-nav navbar-right hidden-sm">
-                            <li class="marginR5" data-toggle="tooltip" data-placement="top" title="Logout"><a href="login.html"><i class="fa fa-power-off"></i></a></li>
-                        </ul>
-                    </div>
-                    <div class="btn-group pull-right hidden-sm mar-top17 mob2">
-                        <button type="button" class="btn btn-primary dropdown-toggle btn-sm" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                            Welcome Maribel Brogden <span class="caret"></span>
-                        </button>
-                        <ul class="dropdown-menu">
-                            <li><a href="#"><strong>Date:</strong> 05/08/2017</a></li>
-                        </ul>
-                    </div>
-                </div>
-                <!--logout-->
-            </div>
-        </div>
-    </nav>
-`
-})
-export class SiteMenuComponent implements AfterViewInit {
-
-    @Input('type')
-    type: string = 'fixed';
-
-    @Input('hidden')
-    hidden: boolean = true;
-
-    constructor(public application: ApplicationService, private router: Router) { }
-
-    hiddenClass(): string {
-        if (this.hidden)
-            return "hidden";
-        else
-            "";
-    }
-
-    ngAfterViewInit(): void {
-        setTimeout(() => this.attachSideBar(), 2000);
-    }
-
-    getMenuIconOrText(menuItem: any): string {
-        if (menuItem.icon == null)
-            return menuItem.name;
-        else
-            return "<i class='large " + menuItem.icon + " icon'></i>";
-    }
-
-    makeActive(index: number): string {
-        if (index == 0)
-            return "active";
-        else
-            return "";
-    }
-
-    attachSideBar(): void {
-        if (jQuery != null) {
-            jQuery('.ui.sidebar')
-                .sidebar('attach events', '.toc.item');
-
-            jQuery('.ui.dropdown')
-                .dropdown();
-        }
-    }
-
-    navigateToUrl(url: string): void {
-        this.router.navigate([url]);
-    }
-
+import { Component, AfterViewInit, Input, OnInit } from '@angular/core';
+import { ApplicationService } from '../services/application.service';
+import { Router } from '@angular/router';
+
+declare var jQuery: any;
+
+@Component({
+    selector: 'site-menu',    
+    template: `
+<nav class="navbar navbar-inverse navbar-fixed-top">
+        <div class="container-fluid">
+            <div class="navbar-header">
+
+                <a class="navbar-brand" href="#"><img src="app/assets/img/logo-main.png" class="img-responsive" alt=""></a>
+                <div class="">
+                    <div class="btn-group pull-right">
+                        <ul class="nav navbar-nav navbar-right visible-sm visible-md">
+                            <li class="marginR5" data-toggle="tooltip" data-placement="top" title="Logout"><a href="login.html"><i class="fa fa-power-off"></i></a></li>
+                        </ul>
+                    </div>
+                    <div class="btn-group pull-right mar-top17 visible-sm visible-md">
+                        <button type="button" class="btn btn-primary dropdown-toggle " data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                            Welcome Maribel Brogden <span class="caret"></span>
+                        </button>
+                        <ul class="dropdown-menu">
+                            <li><a href="#"><strong>Date:</strong> 11/21/2016</a></li>
+                        </ul>
+                    </div>
+                </div>
+                <button type="button" class="navbar-toggle collapsed mar-top17" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
+                    <span class="sr-only">Toggle navigation</span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                </button>
+            </div>
+
+            <div id="navbar" class="navbar-collapse collapse">
+                <ul class="nav navbar-nav toperMenu-spaceleft">
+                    <li class="dropdown">
+                        <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Profile<span class="caret"></span></a>
+                        <ul class="dropdown-menu">
+                            <li><a routerLink="admin-update-profile" routerLinkActive="active">Update Profile</a></li>
+                            <li><a routerLink="admin-change-password" routerLinkActive="active">Change Password</a></li>
+                            <li><a routerLink="admin-change-user-id" routerLinkActive="active">Change User ID</a></li>
+                        </ul>
+                    </li>
+                    <li class="dropdown">
+                        <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Licenses<span class="caret"></span></a>
+                        <ul class="dropdown-menu">
+                            <li><a routerLink="admin-search-license" routerLinkActive="active">Search License</a></li>
+                            <li><a routerLink="admin-add-new-license" routerLinkActive="active">Add New License</a></li>
+                            <li><a routerLink="admin-setup-test-account" routerLinkActive="active">Setup Test Account</a></li>
+                        </ul>
+                    </li>
+                    <li class="dropdown">
+                        <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Product Features<span class="caret"></span></a>
+                        <ul class="dropdown-menu">
+                            <li><a routerLink="admin-manage-discount-code" routerLinkActive="active">Manage Discount Code</a></li>
+                            <li><a routerLink="admin-subscription-price" routerLinkActive="active">Subscription Price</a></li>
+                        </ul>
+                    </li>
+                    <li class="dropdown">
+                        <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Users<span class="caret"></span></a>
+                        <ul class="dropdown-menu">
+                            <li><a routerLink="admin-list-user" routerLinkActive="active">List User</a></li>
+                            <li><a routerLink="admin-add-user" routerLinkActive="active">Add User</a></li>
+                            <li><a routerLink="admin-unblock-user" routerLinkActive="active">Unblock User</a></li>
+                            <li><a routerLink="admin-user-group" routerLinkActive="active">User Group</a></li>
+                        </ul>
+                    </li>
+                    <li class="dropdown">
+                        <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Reports<span class="caret"></span></a>
+                        <ul class="dropdown-menu">
+                            <li><a routerLink="admin-usage-report" routerLinkActive="active">Usage Report</a></li>
+                            <li><a routerLink="customer-summary-report" routerLinkActive="active">Customer Summary Report</a></li>
+                            <li><a routerLink="admin-expiring-subscription-report" routerLinkActive="active">Expiring Subscription Report</a></li>
+                            <li><a routerLink="admin-new-subscription-report" routerLinkActive="active">New Subscription Report</a></li>
+                            <li><a routerLink="admin-subscription-cancellation-report" routerLinkActive="active">Subscription Cancellation Report</a></li>
+                            <li><a routerLink="admin-net-ad-subscription-report" routerLinkActive="active">Net AD Subscription Report</a></li>
+                            <li><a routerLink="admin-site-license-usage-report" routerLinkActive="active">Site License Usage Report</a></li>
+                            <li><a routerLink="admin-discount-code-report" routerLinkActive="active">Discount Code Report</a></li>
+                            <li><a routerLink="admin-image-export-report" routerLinkActive="active">Image Export Report</a></li>
+                        </ul>
+                    </li>
+                    <li class="dropdown">
+                        <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Site Account<span class="caret"></span></a>
+                        <ul class="dropdown-menu">
+                            <li><a routerLink="admin-add-building-level-account" routerLinkActive="active">Add Building Level Account</a></li>
+                        </ul>
+                    </li>
+                    <li class="dropdown">
+                        <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Profile<span class="caret"></span></a>
+                        <ul class="dropdown-menu">
+                            <li><a routerLink="admin-view-update-profile" >View/Update Profile</a></li>
+                            <li><a routerLink="admin-manage-modesty-settings" >Manage Modesty Settings</a></li>
+                            <li><a routerLink="admin-manage-module" >Manage Module</a></li>
+                        </ul>
+                    </li>
+                    <li><a href="#">Product</a></li>
+                </ul>
+                <!--logout-->
+                <div class="wel-brog">
+                    <div class="btn-group pull-right mob1">
+                        <ul class="nav navbar-nav navbar-right hidden-sm">
+                            <li class="marginR5" data-toggle="tooltip" data-placement="top" title="Logout"><a href="login.html"><i class="fa fa-power-off"></i></a></li>
+                        </ul>
+                    </div>
+                    <div class="btn-group pull-right hidden-sm mar-top17 mob2">
+                        <button type="button" class="btn btn-primary dropdown-toggle btn-sm" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                            Welcome Maribel Brogden <span class="caret"></span>
+                        </button>
+                        <ul class="dropdown-menu">
+                            <li><a href="#"><strong>Date:</strong> 05/08/2017</a></li>
+                        </ul>
+                    </div>
+                </div>
+                <!--logout-->
+            </div>
+        </div>
+    </nav>
+`
+})
+export class SiteMenuComponent implements AfterViewInit {
+
+    @Input('type')
+    type: string = 'fixed';
+
+    @Input('hidden')
+    hidden: boolean = true;
+
+    constructor(public application: ApplicationService, private router: Router) { }
+
+    hiddenClass(): string {
+        if (this.hidden)
+            return "hidden";
+        else
+            "";
+    }
+
+    ngAfterViewInit(): void {
+        setTimeout(() => this.attachSideBar(), 2000);
+    }
+
+    getMenuIconOrText(menuItem: any): string {
+        if (menuItem.icon == null)
+            return menuItem.name;
+        else
+            return "<i class='large " + menuItem.icon + " icon'></i>";
+    }
+
+    makeActive(index: number): string {
+        if (index == 0)
+            return "active";
+        else
+            return "";
+    }
+
+    attachSideBar(): void {
+        if (jQuery != null) {
+            jQuery('.ui.sidebar')
+                .sidebar('attach events', '.toc.item');
+
+            jQuery('.ui.dropdown')
+                .dropdown();
+        }
+    }
+
+    navigateToUrl(url: string): void {
+        this.router.navigate([url]);
+    }
+
 }
\ No newline at end of file
diff --git a/400-SOURCECODE/AIAHTML5.Web/content/images/DA/75/body-views/3/layers/0/1/A/2303_mci.png b/400-SOURCECODE/AIAHTML5.Web/content/images/DA/75/body-views/3/layers/0/1/A/2303_mci.png
deleted file mode 100644
index 73c8ade..0000000
--- a/400-SOURCECODE/AIAHTML5.Web/content/images/DA/75/body-views/3/layers/0/1/A/2303_mci.png
+++ /dev/null
diff --git a/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/10/W/thumbnails/da_tni_3344_W.jpg b/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/10/W/thumbnails/da_tni_3344_W.jpg
deleted file mode 100644
index 8276d5a..0000000
--- a/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/10/W/thumbnails/da_tni_3344_W.jpg
+++ /dev/null
diff --git a/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/11/A/navigator_images/da_oi_10.jpg b/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/11/A/navigator_images/da_oi_10.jpg
deleted file mode 100644
index 60a9b88..0000000
--- a/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/11/A/navigator_images/da_oi_10.jpg
+++ /dev/null
diff --git a/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/11/L/navigator_images/da_oi_21.jpg b/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/11/L/navigator_images/da_oi_21.jpg
deleted file mode 100644
index 80feeb5..0000000
--- a/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/11/L/navigator_images/da_oi_21.jpg
+++ /dev/null
diff --git a/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/11/L/navigator_images/da_oi_22.jpg b/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/11/L/navigator_images/da_oi_22.jpg
deleted file mode 100644
index fe4d16e..0000000
--- a/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/11/L/navigator_images/da_oi_22.jpg
+++ /dev/null
diff --git a/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/2/L/navigator_images/da_oi_117.jpg b/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/2/L/navigator_images/da_oi_117.jpg
deleted file mode 100644
index bca8612..0000000
--- a/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/2/L/navigator_images/da_oi_117.jpg
+++ /dev/null
diff --git a/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/2/L/thumbnails/da_tni_3336_L.jpg b/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/2/L/thumbnails/da_tni_3336_L.jpg
deleted file mode 100644
index 54a03bc..0000000
--- a/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/2/L/thumbnails/da_tni_3336_L.jpg
+++ /dev/null
diff --git a/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/2/W/navigator_images/da_oi_119.jpg b/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/2/W/navigator_images/da_oi_119.jpg
deleted file mode 100644
index be88eba..0000000
--- a/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/2/W/navigator_images/da_oi_119.jpg
+++ /dev/null
diff --git a/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/3/B/navigator_images/da_oi_123.jpg b/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/3/B/navigator_images/da_oi_123.jpg
deleted file mode 100644
index 300dca6..0000000
--- a/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/3/B/navigator_images/da_oi_123.jpg
+++ /dev/null
diff --git a/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/3/B/thumbnails/da_tni_3337_BN.jpg b/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/3/B/thumbnails/da_tni_3337_BN.jpg
deleted file mode 100644
index 7188063..0000000
--- a/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/3/B/thumbnails/da_tni_3337_BN.jpg
+++ /dev/null
diff --git a/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/4/L/thumbnails/da_tni_3338_L.jpg b/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/4/L/thumbnails/da_tni_3338_L.jpg
deleted file mode 100644
index f45ca94..0000000
--- a/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/4/L/thumbnails/da_tni_3338_L.jpg
+++ /dev/null
diff --git a/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/4/W/navigator_images/da_oi_135.jpg b/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/4/W/navigator_images/da_oi_135.jpg
deleted file mode 100644
index 115cba5..0000000
--- a/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/4/W/navigator_images/da_oi_135.jpg
+++ /dev/null
diff --git a/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/4/W/thumbnails/da_tni_3338_W.jpg b/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/4/W/thumbnails/da_tni_3338_W.jpg
deleted file mode 100644
index 6861a66..0000000
--- a/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/4/W/thumbnails/da_tni_3338_W.jpg
+++ /dev/null
diff --git a/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/5/A/navigator_images/da_oi_1.jpg b/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/5/A/navigator_images/da_oi_1.jpg
deleted file mode 100644
index c1573ad..0000000
--- a/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/5/A/navigator_images/da_oi_1.jpg
+++ /dev/null
diff --git a/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/5/L/navigator_images/da_oi_18.jpg b/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/5/L/navigator_images/da_oi_18.jpg
deleted file mode 100644
index 5765f2b..0000000
--- a/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/5/L/navigator_images/da_oi_18.jpg
+++ /dev/null
diff --git a/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/5/L/navigator_images/da_oi_9.jpg b/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/5/L/navigator_images/da_oi_9.jpg
deleted file mode 100644
index 2c90644..0000000
--- a/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/5/L/navigator_images/da_oi_9.jpg
+++ /dev/null
diff --git a/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/5/L/thumbnails/da_tni_3339_LN.jpg b/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/5/L/thumbnails/da_tni_3339_LN.jpg
deleted file mode 100644
index 3002af5..0000000
--- a/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/5/L/thumbnails/da_tni_3339_LN.jpg
+++ /dev/null
diff --git a/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/5/L/thumbnails/da_tni_3339_LY.jpg b/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/5/L/thumbnails/da_tni_3339_LY.jpg
deleted file mode 100644
index 3a65c77..0000000
--- a/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/5/L/thumbnails/da_tni_3339_LY.jpg
+++ /dev/null
diff --git a/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/7/A/navigator_images/da_oi_57.jpg b/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/7/A/navigator_images/da_oi_57.jpg
deleted file mode 100644
index 7d02791..0000000
--- a/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/7/A/navigator_images/da_oi_57.jpg
+++ /dev/null
diff --git a/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/7/B/navigator_images/da_oi_61.jpg b/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/7/B/navigator_images/da_oi_61.jpg
deleted file mode 100644
index 790d515..0000000
--- a/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/7/B/navigator_images/da_oi_61.jpg
+++ /dev/null
diff --git a/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/7/B/navigator_images/da_oi_62.jpg b/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/7/B/navigator_images/da_oi_62.jpg
deleted file mode 100644
index 2d221c6..0000000
--- a/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/7/B/navigator_images/da_oi_62.jpg
+++ /dev/null
diff --git a/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/7/B/thumbnails/da_tni_3341_BN.jpg b/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/7/B/thumbnails/da_tni_3341_BN.jpg
deleted file mode 100644
index 1cd58ef..0000000
--- a/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/7/B/thumbnails/da_tni_3341_BN.jpg
+++ /dev/null
diff --git a/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/7/L/thumbnails/da_tni_3341_LY.jpg b/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/7/L/thumbnails/da_tni_3341_LY.jpg
deleted file mode 100644
index b964f19..0000000
--- a/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/7/L/thumbnails/da_tni_3341_LY.jpg
+++ /dev/null
diff --git a/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/7/W/navigator_images/da_oi_69.jpg b/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/7/W/navigator_images/da_oi_69.jpg
deleted file mode 100644
index 166872f..0000000
--- a/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/7/W/navigator_images/da_oi_69.jpg
+++ /dev/null
diff --git a/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/7/W/navigator_images/da_oi_70.jpg b/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/7/W/navigator_images/da_oi_70.jpg
deleted file mode 100644
index b08f08f..0000000
--- a/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/7/W/navigator_images/da_oi_70.jpg
+++ /dev/null
diff --git a/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/7/W/thumbnails/da_tni_3341_WN.jpg b/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/7/W/thumbnails/da_tni_3341_WN.jpg
deleted file mode 100644
index 1bb60fe..0000000
--- a/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/7/W/thumbnails/da_tni_3341_WN.jpg
+++ /dev/null
diff --git a/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/8/W/navigator_images/da_oi_79.jpg b/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/8/W/navigator_images/da_oi_79.jpg
deleted file mode 100644
index 0654dce..0000000
--- a/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/8/W/navigator_images/da_oi_79.jpg
+++ /dev/null
diff --git a/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/8/W/thumbnails/da_tni_3342_w.jpg b/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/8/W/thumbnails/da_tni_3342_w.jpg
deleted file mode 100644
index ecdcbba..0000000
--- a/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/8/W/thumbnails/da_tni_3342_w.jpg
+++ /dev/null
diff --git a/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/9/A/navigator_images/da_oi_90.jpg b/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/9/A/navigator_images/da_oi_90.jpg
deleted file mode 100644
index b98474e..0000000
--- a/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/9/A/navigator_images/da_oi_90.jpg
+++ /dev/null
diff --git a/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/9/A/thumbnails/da_tni_3343_A.jpg b/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/9/A/thumbnails/da_tni_3343_A.jpg
deleted file mode 100644
index f31b32e..0000000
--- a/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/9/A/thumbnails/da_tni_3343_A.jpg
+++ /dev/null
diff --git a/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/9/B/navigator_images/da_oi_92.jpg b/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/9/B/navigator_images/da_oi_92.jpg
deleted file mode 100644
index 1d08168..0000000
--- a/400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/9/B/navigator_images/da_oi_92.jpg
+++ /dev/null